Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
commitb1637e3201e52a5fb8f3459438c3e5333a5432be
tree3099cd4900b0ac6493d69927aaed9ba6c70d6a18
parentba3621566938ba71877128e0628d360565d12b15
parent6582d30c264c8b15d88f9da452f016c73af60822
Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk/blender
CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c