Merging r48196 through r48223 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jun 2012 18:08:56 +0000 (18:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jun 2012 18:08:56 +0000 (18:08 +0000)
commit06fb9c85d4f37ed715e3cd3a1eeac5193da3d08d
treef41c73fd836b1c203bbcb4b010d5218ad22a1572
parent0fd17973041b45eb8c71299e2834edd8fe96b776
parent870dba7657c7cc169a9d98695134f3ee8de8cd5b
Merging r48196 through r48223 from trunk into soc-2011-tomato
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt