Merging r44140 through r44226 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 18 Feb 2012 16:12:22 +0000 (16:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 18 Feb 2012 16:12:22 +0000 (16:12 +0000)
commit746e712f7a319f8db44fd29f91c88227bfc31cc6
treef5a7af55b14d4a556a13f1f59c0e0837fa6fbde4
parent62d09c9103f07c86c484d2a044a8884c337a92a3
parente6b708b36bb77ff2287439f20fc79097c275c822
Merging r44140 through r44226 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_clip.h
source/blender/makesdna/DNA_space_types.h