svn merge ^/trunk/blender -r55776:55813
authorCampbell Barton <ideasman42@gmail.com>
Fri, 5 Apr 2013 15:42:31 +0000 (15:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 5 Apr 2013 15:42:31 +0000 (15:42 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge