Merged revision(s) 58356-58423 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:34:19 +0000 (15:34 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:34:19 +0000 (15:34 +0000)
Note: Keep own splash.

1  2 
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/drawnode.c
source/blender/nodes/NOD_static_types.h