Merging r37594 through r37703 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 21 Jun 2011 18:24:00 +0000 (18:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 21 Jun 2011 18:24:00 +0000 (18:24 +0000)
commit9f769c43a36f0c45721534d5d1d7207586f44df5
tree9bdea35a46c5df2e700ad2d4c4420ace2de12787
parent030f8c3a10ed396e0bc0b81410e12131a1f6e2d2
parenteaae38551f19a06c903c8beadbcaad9453b81b49
Merging r37594 through r37703 from trunk into soc-2011-tomato
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt