aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen/glX_server_table.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2015-06-151-23/+15
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: freetype/src/base/ftfntfmt.c freetype/src/cache/ftcimage.c freetype/src/cid/cidriver.c freetype/src/truetype/ttdriver.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c openssl/Makefile
| * fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git ↵release/externalmarha2015-06-151-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | update 15 June 2015 xserver commit fa12f2c150b2f50de9dac4a2b09265f13af353af libxcb commit f85661c3bca97faa72431df92a3867be39a74e23 libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0 libX11 commit f0286b2770ece10aef5e2e8c004260217f12fd25 pixman commit eebc1b78200aff075dbcae9c8d00edad1f830d91 fontconfig commit f6d61c9beed856a925bd60c025b55284b2d88161 mesa commit 932d1613d1e15ec22555e5ec09105c49eb850e36
* | Synchronised mesa filesmarha2012-11-201-0/+0
| |
* | Solved problems introduced in mergemarha2012-10-111-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-111-324/+324
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-343/+343
| | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
| * git update mesa 14 dec 2011marha2011-12-141-1/+0
| |
| * Preperation for new release of mesamarha2010-11-221-0/+411
|
* Synchronised filesmarha2011-11-071-1/+4
|
* Preperation of new merge with directory movesmarha2010-11-221-0/+411