Merging r38419 through r38432 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 16 Jul 2011 10:01:00 +0000 (10:01 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 16 Jul 2011 10:01:00 +0000 (10:01 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge