Merging r49808 through r49814 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 18:25:45 +0000 (18:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 18:25:45 +0000 (18:25 +0000)
1  2 
SConstruct
build_files/cmake/macros.cmake

diff --cc SConstruct
Simple merge
Simple merge