Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 16 Jun 2013 12:05:39 +0000 (12:05 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 16 Jun 2013 12:05:39 +0000 (12:05 +0000)
1  2 
intern/cycles/kernel/svm/svm.h
source/blender/blenkernel/intern/node.c

Simple merge