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

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4413e04 a1f4be4)

author	Sergey Sharybin <sergey.vfx@gmail.com>
	Wed, 2 May 2012 18:07:01 +0000 (18:07 +0000)
committer	Sergey Sharybin <sergey.vfx@gmail.com>
	Wed, 2 May 2012 18:07:01 +0000 (18:07 +0000)
commit	3336909050ed97fd352427698c34cd802428efd1
tree	afb767924d623eb715a368f8b81e45e289bda3c6	tree
parent	4413e0472d55c979777a9c5b7a9bb95497cbaa84	commit \| diff
parent	a1f4be4577776add4a71ac3446aceb4195234fc7	commit \| diff

Merging r46137 through r46202 from trunk into soc-2011-tomato

13 files changed:

release/scripts/startup/bl_ui/space_clip.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/BKE_node.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/context.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/include/ED_clip.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_clip/clip_editor.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_clip/space_clip.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_node/drawnode.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_nodetree.c	diff1 \|	diff2 \|	blob \| history
source/blenderplayer/bad_level_call_stubs/stubs.c	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Repository to test new patches