Merging r41158 through r41175 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Oct 2011 09:15:22 +0000 (09:15 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Oct 2011 09:15:22 +0000 (09:15 +0000)
14 files changed:
1  2 
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/screen/area.c
source/blender/editors/transform/transform.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge