aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_program.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-181-33/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * pixman git update 18 July 2011marha2011-07-181-33/+31
| |
* | 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-03-171-1/+1
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1/+1
| |
* | svn merge ^/branches/released .marha2011-02-091-2/+13
|\|
| * libX11 mesa git update 9 Feb 2011marha2011-02-091-1154/+1165
|/
* xkeyboard-config and mesa git update 9/1/2011marha2011-01-091-0/+1
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+2
|
* xserver and mesa git update 28-12-2010marha2010-12-281-0/+1151