Merging r48538 through r48544 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Jul 2012 15:14:14 +0000 (15:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 3 Jul 2012 15:14:14 +0000 (15:14 +0000)
1  2 
source/blender/blenkernel/intern/image.c