svn merge ^/trunk/blender -r48638:48658

author Campbell Barton <ideasman42@gmail.com>

Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)

committer Campbell Barton <ideasman42@gmail.com>

Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
author Campbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
committer Campbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc SConstruct
Simple merge
diff --cc build_files/scons/config/win64-mingw-config.py
Simple merge
diff --cc source/blender/blenkernel/intern/node.c
Simple merge
diff --cc source/creator/CMakeLists.txt
Simple merge
author	Campbell Barton <ideasman42@gmail.com>
	Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
committer	Campbell Barton <ideasman42@gmail.com>
	Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
SConstruct	patch \|	diff1 \|	diff2 \|	blob \| history
build_files/scons/config/win64-mingw-config.py	patch \|	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/node.c	patch \|	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history