Merging r39050 through r39101 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_userdef_types.h
index 6d64a15e9028b820fc666a29f1f253b6fda81531..b8d44bc798b2d3abc2320dfe6828dbb77fd51545 100644 (file)
@@ -347,7 +347,8 @@ typedef struct UserDef {
        struct ListBase themes;
        struct ListBase uifonts;
        struct ListBase uistyles;
-       struct ListBase keymaps;
+       struct ListBase keymaps;                /* deprecated in favor of user_keymaps */
+       struct ListBase user_keymaps;
        struct ListBase addons;
        char keyconfigstr[64];