Merge branch 'mesa_7_5_branch'
authorMichel Dänzer <daenzer@vmware.com>
Sun, 30 Aug 2009 11:06:18 +0000 (13:06 +0200)
committerMichel Dänzer <michel@daenzer.net>
Sun, 30 Aug 2009 11:06:18 +0000 (13:06 +0200)
commit9053bb0d405db0b1a2a917317c7ec41e63b54f09
treefaaa373cf126c3d23169a436f72d24c89e8d6812
parent3c1172f06636ff4aec24a6c68df937844da73a53
parentedb117879846155632aaeb66483a3085c7a78815
Merge branch 'mesa_7_5_branch'

Conflicts:
src/glx/x11/glxcmds.c
src/glx/x11/glxcmds.c