git.blender.org - blender-staging.git/commit

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 33efa9e 25a2eb4)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
commit	c8deda32763d68b59d28f00734785dc0c7a91571
tree	d5b7320d79136c7c2d0282fe45ec3be619ec6806	tree
parent	33efa9eeb63db672d9da97b68718aefb14b98f64	commit \| diff
parent	25a2eb4675f8e1fcf8b990bc345aac694dba8228	commit \| diff

Merged changes in the trunk up to revision 35505.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

14 files changed:

release/scripts/ui/properties_render.py	diff1 \|	diff2 \|	blob \| history
release/scripts/ui/space_dopesheet.py	diff1 \|	diff2 \|	blob \| history
release/scripts/ui/space_userpref.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/idcode.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_material_types.h	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/intern/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/shadeinput.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/shadeoutput.c	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Repository to test new patches