merged changes to revision 24077
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 25 Oct 2009 10:43:03 +0000 (10:43 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 25 Oct 2009 10:43:03 +0000 (10:43 +0000)
1  2 
source/blender/blenkernel/intern/blender.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/SConscript

Simple merge
Simple merge
Simple merge