aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-201-27/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-201-27/+31
| |
* | merge ^/branches/released .marha2011-05-181-1/+6
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-181-1/+6
| |
* | merge ^/branches/released .marha2011-05-161-15/+47
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-613/+645
|/
* Added extra needed filesmarha2011-04-301-0/+613