Merge branch 'master' into d3d10
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 23 Sep 2011 07:33:13 +0000 (08:33 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 23 Sep 2011 07:33:13 +0000 (08:33 +0100)
commitae2b4d32ed56e3ac193cc7205aeb58082c448ce8
tree7225d26bd1400dacb64ed680fd1514611f6cf025
parentaf7d231ddf7f7fef342782932e85479044de1757
parent892cad6f24175221d2e7bdf3c7fe6c34b64ee50a
Merge branch 'master' into d3d10

Conflicts:
CMakeLists.txt
CMakeLists.txt