svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 04:17:43 +0000 (04:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 04:17:43 +0000 (04:17 +0000)
1  2 
CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_object_api.c
source/creator/CMakeLists.txt

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