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

author	Sergey Sharybin <sergey.vfx@gmail.com>
	Wed, 1 Aug 2012 19:23:50 +0000 (19:23 +0000)
committer	Sergey Sharybin <sergey.vfx@gmail.com>
	Wed, 1 Aug 2012 19:23:50 +0000 (19:23 +0000)
commit	ccf0b13fdc8c80cd24f6c68a6b4fbf44284a828d
tree	7d7610465a4d1c3e82b87c9be0f270b00631e5ed	tree \| snapshot
parent	0f6eb8c2cd0750f7a8af290ea574ce7306356228	commit \| diff
parent	6a6bcea81765976e902a4bac99ff9cbcd0faed55	commit \| diff

Merging r49463 through r49478 from trunk into soc-2011-tomato

Repository to test new patches

source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_internal.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_node/node_intern.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history