Merging r39050 through r39101 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 6 Aug 2011 14:52:45 +0000 (14:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 6 Aug 2011 14:52:45 +0000 (14:52 +0000)
commit462670b84567de09048205882d9e98c9035eb835
tree23c2bb67a1e5cb297a5a66b291fcd96e812aad51
parent00fd8b59d112a8de2f29e746a56fcddba161c739
parentdc4dede8029801580683551b39f967c206720736
Merging r39050 through r39101 from trunk into soc-2011-tomato
15 files changed:
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c