Merging r58073 through r58111 from trunk into soc-2013-depsgraph_mt

2013-07-09 08:44:06 +00:00
parent 0bf3e7c5c6 80738a1828
commit 643d709d14
44 changed files with 856 additions and 317 deletions
--- a/release/scripts/startup/bl_ui/space_userpref_keymap.py
+++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1052,7 +1052,7 @@ class USERPREF_PT_input(Panel):
        row.separator()

    def draw(self, context):
-        from bl_ui.space_userpref_keymap import draw_keymaps
+        from rna_keymap_ui import draw_keymaps

        layout = self.layout