aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/SConscript
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
| * libxcb mesa xkeyboard-config git update 14 June 2011marha2011-06-141-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| |
* | svn merge ^/branches/released .marha2011-04-271-7/+71
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-7/+71
| |
* | svn merge ^/branches/released .marha2011-04-121-0/+1
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-416/+417
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-0/+12
|
* xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-0/+2
|
* libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-402/+402
|
* xserver mesa git update 10 Mar 2011marha2011-03-101-0/+1
|
* xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-0/+4
|
* xkeyboard-config mesa git update 2 Mar 2011marha2011-03-021-2/+6
|
* pixman mesa git update 1 Mar 2011marha2011-03-011-0/+2
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-393/+391
|
* mesalib git update 22/1/2011marha2011-01-221-0/+63
|
* xserver and mesa git update 28-12-2010marha2010-12-281-0/+330
|
* Updated to Mesa 7.7marha2010-03-071-356/+0
|
* Forgotten files in previous commitmarha2009-12-221-0/+356