Merged changes in the trunk up to revision 39117.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Aug 2011 11:13:56 +0000 (11:13 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Aug 2011 11:13:56 +0000 (11:13 +0000)
1  2 
build_files/scons/tools/Blender.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge