Merging r39984 through r39997 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Sep 2011 08:09:06 +0000 (08:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Sep 2011 08:09:06 +0000 (08:09 +0000)
commit6cafb95ee129b66fbefe384f044b1b9154d70ddb
tree093101e4f9ee723266b0abde8ad70c21e9d5b283
parent9b76c09a824d4c3ec513a362cca18d9d938aa07c
parent520778163debe82b8cebe9ddec6ab4111ab2d6bd
Merging r39984 through r39997 from trunk into soc-2011-tomato
release/datafiles/blenderbuttons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/include/UI_icons.h
source/blender/makesrna/RNA_access.h