Merged changes in the trunk up to revision 31284.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 12 Aug 2010 13:41:59 +0000 (13:41 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 12 Aug 2010 13:41:59 +0000 (13:41 +0000)
commit1a875f915dc3b2c9ccd766f6dadc80e9fb1f6683
tree979d052f02518405e6e1894443491deae3e95416
parentf510faed6cb982bc98d3049a78e1ab27ddd9cc16
parent702ce76cd28392745132feb2dfb6592d220cb8ec
Merged changes in the trunk up to revision 31284.
release/scripts/ui/properties_render.py
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/python/doc/sphinx_doc_gen.py