Merging r38993 through r39028 from trunk into sox-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:52:26 +0000 (16:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:52:26 +0000 (16:52 +0000)
commitec5a7d6206c15bfd0c3b885c639133331cbd721d
treef7fadb3b739e758e0efbfd28a9dcc9a6f125fd9a
parent6529882e9e8b4138cd2648b2f04f1719e3bb5593
parent36bf4385c2c2a1d3f462d30138b6815287d8e548
Merging r38993 through r39028 from trunk into sox-2011-tomato
release/scripts/startup/bl_ui/space_userpref_keymap.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c