Merging r40345 through r40365 from trunk into soc-2011-garlic
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:47:05 +0000 (15:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:47:05 +0000 (15:47 +0000)
commit8dbc7a3ba321ce545c5ebfaa306c62314a38ff48
tree7dc24b3605617c69022bccf6cd87521379626ac1
parent8961f24425954c7f6fcaed94f6b0c776a00719ea
parentd78231734d6ccf224738ea76307c26f8c0d4dab4
Merging r40345 through r40365 from trunk into soc-2011-garlic
13 files changed:
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_userdef.c