svn merge ^/trunk/blender -r40431:40432
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:47:53 +0000 (11:47 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:47:53 +0000 (11:47 +0000)
commit75e7f633225a7608c25dfdbce4243e6b56268b4e
treed70ba3ebd13228f9f3478eab47677285328f0c8e
parent5bd83eede042302dc734810a3a314eb3320b2ed5
parentf4c56a879d946fb0a233307f72cd739e900f9f7c
svn merge ^/trunk/blender -r40431:40432
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py