svn merge ^/trunk/blender -r49854:49867
authorCampbell Barton <ideasman42@gmail.com>
Mon, 13 Aug 2012 09:35:11 +0000 (09:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 13 Aug 2012 09:35:11 +0000 (09:35 +0000)
1  2 
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/node_draw.c
source/blender/imbuf/IMB_imbuf.h
source/blender/imbuf/intern/divers.c
source/blender/makesdna/DNA_node_types.h

Simple merge
Simple merge