git.blender.org - blender.git/commit

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 9 May 2010 12:42:19 +0000 (12:42 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 9 May 2010 12:42:19 +0000 (12:42 +0000)
commit	1e30f000308debebf7cd5bbf6a9b37b8a94182de
tree	d6edeb35644fd1048d4b71d1f55ef1ab019bacef	tree
parent	8a20433f0fef5ab2d881d010cd5bd19fe484e555	commit \| diff
parent	80f6671dfe64ece1e692c8032e1d1169621bceff	commit \| diff

Merged changes in the trunk up to revision 28685.

The official Blender Foundation tree

source/blender/blenloader/intern/readfile.c	diff1 \|	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/editors/space_view3d/view3d_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	diff1 \|	diff2 \|	blob \| history
source/blender/freestyle/intern/stroke/Canvas.cpp	diff1 \|	\|	blob \| history
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp	diff1 \|	\|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history