Merging r47874 through r47885 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:22:24 +0000 (11:22 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:22:24 +0000 (11:22 +0000)
1  2 
source/blender/compositor/intern/COM_Converter.cpp