svn merge ^/trunk/blender -r44136:44189
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 15:51:48 +0000 (15:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 15:51:48 +0000 (15:51 +0000)
commit4c66e696fbcaefe40f0394fea8fc4a55bb7d6994
treee8f60920e276ec1fec3c8014b77790a6c790deba
parent02987fd5e1fa3715d25bb7b9bd659fd509f40c57
parentb7f3887a3a8a66aeba3a16ae5d76b934af3ccc7c
svn merge ^/trunk/blender -r44136:44189
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_header.c