Merging r37010 through r37122 from trunk into tomato.
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Jun 2011 14:54:37 +0000 (14:54 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Jun 2011 14:54:37 +0000 (14:54 +0000)
commit9864c12eef0f26d6c3e31b6f602cec5d843061fd
tree24321cd18cf0ed5714cc414a8522f5f0d8840ea3
parent0b6f93ea44894de4e2e5148f8d4d4e4001208258
parented072f2fef757cd46113b1216b46c40fbaa532f8
Merging r37010 through r37122 from trunk into tomato.

Manually resolved conflict in startup.blend.c
15 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/space_clip/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt