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)
commitec23feb85c083a89731f852943c99991f3ef0186
tree5cded4eb64088f48d7cc87041eb6171efaddfb1c
parentc8934b44f9f958a8d270a9f18a2fe24b033236ed
parent4f4a46812815c398ad9b719e1a7500e2925b34fb
svn merge ^/trunk/blender -r49653:49658
CMakeLists.txt
release/scripts/startup/bl_ui/space_sequencer.py