Merging r38364 through r38389 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jul 2011 12:04:21 +0000 (12:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jul 2011 12:04:21 +0000 (12:04 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/makesrna/intern/rna_constraint.c

diff --cc CMakeLists.txt
Simple merge
Simple merge