Merged changes in the trunk up to revision 39368.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 13 Aug 2011 23:29:16 +0000 (23:29 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 13 Aug 2011 23:29:16 +0000 (23:29 +0000)
commit4e0b1d9177bafacd4692c380bf3422a0a78a6647
tree444a46ff9dff930f652df74e03fb08e8352ee22d
parent66950123f1ad40b85789084de12aaea7f8173be5
parent65d9d2e3e0edec49ea7befc0200542b59c956a33
Merged changes in the trunk up to revision 39368.

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blenderplayer/bad_level_call_stubs/stubs.c