Merged changes in the trunk up to revision 29184.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 3 Jun 2010 15:39:02 +0000 (15:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 3 Jun 2010 15:39:02 +0000 (15:39 +0000)
commitca6f7ddd991940d6d26162e242a70c232475a3d2
treebda3e56b795606b93892023c3c5701995ff9be20
parent052cc71c4011adff7c748f283fe0d6b70ebfa0fa
parent2beef23a9bc131ed182e92f009df56d6838a13c0
Merged changes in the trunk up to revision 29184.
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/creator/creator.c