aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/program.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-151-6/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
| * xserver libX11 mesa git update 15 Julymarha2011-07-151-6/+8
| |
* | svn merge ^/branches/released .marha2011-04-271-1/+0
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-1077/+1076
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-1077/+1077
|
* xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1077/+1077
|
* xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-1/+1
|
* libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1077/+1077
|
* xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-1074/+1077
|
* xkeyboard-config and mesa git update 9/1/2011marha2011-01-091-0/+1
|
* xserver and mesa git update 28-12-2010marha2010-12-281-976/+1073
|
* Added missing needed files for mesalibmarha2010-11-231-0/+976