Merging r38316 through r38338 from trunk into into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jul 2011 18:06:16 +0000 (18:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jul 2011 18:06:16 +0000 (18:06 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge