svn merge ^/trunk/blender -r46714:46724 --- before tile branch merge
authorCampbell Barton <ideasman42@gmail.com>
Sat, 19 May 2012 11:11:00 +0000 (11:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 19 May 2012 11:11:00 +0000 (11:11 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_sequencer_api.c