Merging r37704 through r37731 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Jun 2011 14:44:54 +0000 (14:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Jun 2011 14:44:54 +0000 (14:44 +0000)
1  2 
source/creator/CMakeLists.txt

Simple merge