aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/es_generator.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-091-7/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-7/+5
| |
* | merge ^/branches/released .marha2011-05-241-4/+0
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-764/+760
|/
* xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-0/+4
| | | | May 2011
* xserver and mesa git update 28-12-2010marha2010-12-281-743/+760
|
* Updated to mesalib 7.9marha2010-11-221-0/+743