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)
commite287e9d0c40d1cc9217f4ccfe4e26bbdc407c03e
treece4f9571c3fd1bbb2c2dc40b8ccd33e107dc36f2
parentf0acdcf13526046236ce561736521100cba58ff1
parent6d5cf68aaf1347ff7456bb24a6b064c12aad0659
Merged changes in the trunk up to revision 41387.
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/makesrna/intern/CMakeLists.txt