Merge commit 'origin/master' into gallium-map-range
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 4 Mar 2009 15:23:35 +0000 (15:23 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 4 Mar 2009 15:23:35 +0000 (15:23 +0000)
commit5b04939b16eb6e13858b070315dee1d0fc09d94f
tree0f8739ea6fa7219eaebbb9ff090f86713ef820e0
parentcfd5298f240612ef69ae321aebbc425710a8d731
parentf9ce417aaf14c00e72e92307b910de5dbed1bb6d
Merge commit 'origin/master' into gallium-map-range
src/gallium/include/pipe/p_inlines.h
src/gallium/include/pipe/p_screen.h
src/mesa/state_tracker/st_cb_bufferobjects.c