Merge commit 'origin/master' into glsl-pp-rework-2
authorMichal Krol <michal@vmware.com>
Thu, 17 Sep 2009 10:44:24 +0000 (12:44 +0200)
committerMichal Krol <michal@vmware.com>
Thu, 17 Sep 2009 10:44:24 +0000 (12:44 +0200)
commit2a661c383fee65bc4413541e706925fa3e9b9cf5
treedbea0c9d65d17b81720fe2f161604dfc91eb0546
parent90daefd1c474a6e0502df5053b581987c12b8673
parent21caa29fbd332a2ee05a58df91e1664fbbc4e61f
Merge commit 'origin/master' into glsl-pp-rework-2

Conflicts:
src/gallium/winsys/gdi/SConscript
src/gallium/winsys/gdi/SConscript