Merged changes in the trunk up to revision 32271.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Oct 2010 11:33:32 +0000 (11:33 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Oct 2010 11:33:32 +0000 (11:33 +0000)
1  2 
release/scripts/ui/space_dopesheet.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
Simple merge
Simple merge