Merged changes in the trunk up to revision 41387.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Oct 2011 21:38:01 +0000 (21:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Oct 2011 21:38:01 +0000 (21:38 +0000)
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/makesrna/intern/CMakeLists.txt

Simple merge