Merge commit 'origin/master' into glsl-pp-rework-2
authorMichal Krol <michal@vmware.com>
Mon, 14 Sep 2009 09:22:05 +0000 (11:22 +0200)
committerMichal Krol <michal@vmware.com>
Mon, 14 Sep 2009 09:22:05 +0000 (11:22 +0200)
commit9f273f109875cd9208d4c1c8f5939fb5e507c230
tree35c8adedcf44cf8eb3bddbb51b5efa766539a07b
parentfab99092a0879531442d1dd20f971ae7eda824eb
parentaad0deee4b2d347bdfc536fe98938ed825bf0f6b
Merge commit 'origin/master' into glsl-pp-rework-2