aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/glapi.h
Commit message (Collapse)AuthorAgeFilesLines
* Solved compilation errorsmarha2011-12-231-1/+1
|
* Merge remote-tracking branch 'origin/released'marha2011-11-091-1/+5
|\ | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-091-2/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-0/+6
|\| | | | | | | | | | | | | | | | | 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-0/+6
| | | | | | | | update 5 oct 2011
* | Synchronised filesmarha2011-07-121-3/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-131-177/+181
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-177/+181
| | | | | | | | update 13 Jun 2011
* | Synchronised filesmarha2011-04-291-4/+2
| |
* | Synchronised filesmarha2011-04-011-42/+41
| |
* | svn merge ^/branches/released .marha2011-01-221-5/+0
|\|
| * mesalib git update 22/1/2011marha2011-01-221-5/+0
| |
* | svn merge ^/branches/released .marha2010-12-291-185/+185
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-182/+182
| |
* | svn merge ^/branches/released .marha2010-11-291-70/+57
|\|
| * Updated to mesalib 7.9marha2010-11-221-66/+55
| |
| * Preperation for new release of mesamarha2010-11-221-0/+193
|
* Preperation of new merge with directory movesmarha2010-11-221-0/+198