git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad2f490 66134ea)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Fri, 11 Jun 2010 17:17:02 +0000 (17:17 +0000)
commit	df0b629e246cc7fa091b00b97a2158877bd10ce3
tree	243613c408318df3964fc5ebcd5a7fc33b4ca56d	tree \| snapshot
parent	ad2f4905301854f07d59bc290488da7ce4e7df57	commit \| diff
parent	66134ea38166742444720a4fe2f8d95effd8866a	commit \| diff

Merged changes in the trunk up to revision 29409.

14 files changed:

release/scripts/ui/properties_render.py	diff1 \|	diff2 \|	blob \| history
release/scripts/ui/space_userpref.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/CMakeLists.txt	\|	diff2 \|	blob \| history
source/blender/editors/render/render_shading.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/doc/sphinx_doc_gen.py	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy.c	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree