Merged changes in the trunk up to revision 31880.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 11 Sep 2010 11:16:55 +0000 (11:16 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 11 Sep 2010 11:16:55 +0000 (11:16 +0000)
commitfdb4b0c3ed9279473eb0edf4bac0333e7e929727
tree13ebfc964d5c0588e5c1d67f9b7d00a25a542437
parentb1da4cfcd8091e2bfc124e1729a89301dbb2164b
parent38669bd5fdf703f94de1884798580e9326e00057
Merged changes in the trunk up to revision 31880.
13 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_outliner/outliner.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/python/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/creator/CMakeLists.txt