aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen/glX_proto_size.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2015-04-301-1/+1
|\
| * fontconfig pixman libX11 mesa git update 30 Apr 2015marha2015-04-301-1/+1
| | | | | | | | | | | | | | libX11 commit d3415d1f052530760b4617db45affcb984cfe35c pixman commit e0c0153d8e5d42c08c2b9bd2cf2123bff2c48d75 fontconfig commit 4a6f5efd5f6a468e1872d58e589bcf30ba88e2fd mesa commit 1ac7db07b363207e8ded9259f84bbcaa084b8667
* | Merged origin/release (checked in because wanted to merge new stuff)marha2015-02-221-11/+15
| |
* | Synchronised mesa filesmarha2012-11-201-0/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-171-1/+1
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-171-1/+1
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Solved problems introduced in mergemarha2012-10-111-8/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-111-561/+561
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xwininfo mesa git update 11 oct 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/glX_server_table.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/main/.gitignore
| * xwininfo mesa git update 11 oct 2012marha2012-10-111-569/+569
| | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
* | Merge remote-tracking branch 'origin/released'marha2011-12-141-10/+8
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update mesa 14 dec 2011marha2011-12-141-10/+9
| |
* | Synchronised filesmarha2011-11-071-0/+16
|/
* Updated to mesalib 7.9marha2010-11-221-1/+1
|
* Preperation for new release of mesamarha2010-11-221-0/+704