aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen/gl_API.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-041-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-041-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-118/+1
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-118/+1
| | | | | | | | update 5 oct 2011
* | Synchronised line endinge with release branchmarha2011-09-121-12542/+12542
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-061-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/GL3.txt mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_API.xml 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/main/dd.h mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h mesalib/src/mesa/vbo/vbo_save_api.c
| * mesa git update 6 sep 2011marha2011-09-061-0/+2
| |
* | svn merge ^/branches/released .marha2011-05-031-0/+1
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-0/+1
| |
* | svn merge ^/branches/released .marha2011-04-271-0/+2
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-0/+2
| |
* | svn merge ^/branches/released .marha2011-04-121-0/+2
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-12535/+12537
| |
* | svn merge ^/branches/released .marha2011-04-061-0/+2
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-12533/+12535
| |
* | svn merge ^/branches/released .marha2011-03-301-0/+1
|\|
| * mesa git update 30 Mar 2011marha2011-03-301-12532/+12533
| |
* | svn merge ^/branches/released .marha2011-03-151-0/+2
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-0/+2
| |
* | svn merge ^/branches/released .marha2011-01-161-0/+5
|\|
| * mesalib git update 16/1/2011marha2011-01-161-0/+3
| |
| * mesalib git update 14/1/2011marha2011-01-151-0/+2
| |
* | svn merge ^/branches/released .marha2010-12-291-12514/+12525
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-12514/+12525
| |
* | svn merge ^/branches/released .marha2010-11-291-4/+10
|\|
| * Updated to mesalib 7.9marha2010-11-221-4/+10
| |
| * Preperation for new release of mesamarha2010-11-221-0/+12508
|
* Preperation of new merge with directory movesmarha2010-11-221-0/+12508