Merge trunk up to revision 40611
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000 (13:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000 (13:21 +0000)
commit2970db8ef33593e2c64a9ab20e0baa1d95c36d1b
tree01c96428a88b4ab4401d14f80dcfe7a830622a34
parent96e6e6f877b8265cb769537be86adb7762fe08b4
parent4b24951ff1660237bf26d13528f5b7f5f73becfa
Merge trunk up to revision 40611
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt