Merging r38390 through r38418 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Jul 2011 20:22:01 +0000 (20:22 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Jul 2011 20:22:01 +0000 (20:22 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

Simple merge
Simple merge