Merging r49659 through r49666 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Aug 2012 16:48:43 +0000 (16:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Aug 2012 16:48:43 +0000 (16:48 +0000)
commit93b823784dac122b11d2e4524ad452cff7239e27
tree1141c81e37af3880e42d92bf32680eeb0a661956
parentec23feb85c083a89731f852943c99991f3ef0186
parent6cf1a9834b82ce18d5b5358fe431b48037f1bca4
Merging r49659 through r49666 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_node.py
source/blender/editors/space_node/node_intern.h
source/blender/imbuf/IMB_imbuf.h