svn merge ^/trunk/blender -r48638:48658
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
1  2 
CMakeLists.txt
SConstruct
build_files/scons/config/win64-mingw-config.py
source/blender/blenkernel/intern/node.c
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc SConstruct
Simple merge
Simple merge