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)
commitf5fe447e0094385e0b41c83666c210d13b7720b3
tree891e5baf099e0a8ef98f25b4575707378e5868b1
parente5cbfb54603d0d6aad4337052ba7d66328830f2d
parent5f3bd06f37d13d486ea6a8540b9d7f9cd50f39b7
svn merge ^/trunk/blender -r48638:48658
CMakeLists.txt
SConstruct
build_files/scons/config/win64-mingw-config.py
source/blender/blenkernel/intern/node.c
source/creator/CMakeLists.txt