Merging r49775 through r49807 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 14:39:09 +0000 (14:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 14:39:09 +0000 (14:39 +0000)
1  2 
SConstruct
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_sequencer.py

diff --cc SConstruct
Simple merge
Simple merge