svn merge ^/trunk/blender -r49653:49658
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 15:04:46 +0000 (15:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 15:04:46 +0000 (15:04 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_sequencer.py

diff --cc CMakeLists.txt
Simple merge