Merging r43909 through r43951 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Feb 2012 15:04:56 +0000 (15:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Feb 2012 15:04:56 +0000 (15:04 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/space_clip.c