aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
| * fontconfig mesa git update 21 June 2011marha2011-06-211-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-201-88/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-201-88/+81
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-152-2586/+2666
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
| * mesa xserver git update 15 June 2011marha2011-06-152-2586/+2666
| |
* | Synchronised gen.bat file with makefilemarha2011-06-142-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-142-2594/+3891
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
| * libxcb mesa xkeyboard-config git update 14 June 2011marha2011-06-142-2594/+3891
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-138-203/+8151
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
| * libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵marha2011-06-138-203/+8151
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-093-23/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
| * mesa xkbcomp xkeyboard-config git update 9 Jun 2011marha2011-06-093-23/+26
| |
* | Synchronised files with mesamarha2011-06-031-0/+18
| |
* | Cleaned outputmarha2011-06-031-3/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-039-4297/+4384
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-039-4297/+4384
| |
* | merge ^/branches/released .marha2011-05-241-0/+5
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-238/+243
| |
* | svn merge ^/branches/released .marha2011-05-221-4/+14
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-4/+11
| | | | | | | | May 2011
* | svn merge ^/branches/released .marha2011-05-039-151/+279
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-039-151/+279
| |
* | Synchronised filesmarha2011-04-291-4/+2
| |
* | svn merge ^/branches/released .marha2011-04-2711-4885/+6405
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2711-3919/+5439
| |
* | svn merge ^/branches/released .marha2011-04-1210-4046/+4967
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-1210-74591/+75512
| |
* | svn merge ^/branches/released .marha2011-04-0610-4053/+4137
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-0610-74529/+74613
| |
* | Synchronised filesmarha2011-04-011-42/+41
| |
* | svn merge ^/branches/released .marha2011-03-3010-4152/+4238
|\|
| * Forgotten in previous commitmarha2011-03-301-0/+25
| |
| * mesa git update 30 Mar 2011marha2011-03-309-53541/+53602
| |
* | svn merge ^/branches/released .marha2011-03-284-7/+7
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-284-22514/+22514
| |
* | svn merge ^/branches/released .marha2011-03-241-3/+0
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-241-229/+226
| |
* | svn merge ^/branches/released .marha2011-03-1512-48638/+48719
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-1512-48638/+48719
| |
* | svn merge ^/branches/released .marha2011-03-073-18/+5
|\|
| * Mesa git update 7 Mar 2011marha2011-03-073-729/+716
| |
* | svn merge ^/branches/released .marha2011-01-291-67/+77
|\|
| * libXext libfontenc libXau libX11 libXinerama mesa libXdmcp git update 28 jan ↵marha2011-01-291-67/+77
| | | | | | | | 2011
* | svn merge ^/branches/released .marha2011-01-282-34467/+34469
|\|
| * libfontenc libXau libxcb mesalib git update 28 jan 2011marha2011-01-282-34467/+34469
| |
* | svn merge ^/branches/released .marha2011-01-252-2/+2
|\|
| * mesalib pixman git update 25/1/2011marha2011-01-252-2/+2
| |
* | svn merge ^/branches/released .marha2011-01-223-103/+103
|\|
| * mesalib git update 22/1/2011marha2011-01-223-103/+103
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 11:53:26 +0000