Merging r40366 through r40392 from trunk into soc-2011-garlic soc-2011-garlic
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 12:01:16 +0000 (12:01 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 12:01:16 +0000 (12:01 +0000)
commit7172316b945c62797e6beba953ff203766614531
tree640ac56fadded9c7686399b5a1f1c64f1a135700
parent2015eefef70350382931881dd65ed2da09f8f2cd
parent78d4260144dbf01166fac8bc9303e6d5aa022f71
Merging r40366 through r40392 from trunk into soc-2011-garlic
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_material.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d.c
source/blender/editors/space_view3d/view3d_header.c