Merging r40572 through r40597 from trunk into soc-2011-tomato

2011-09-27 09:26:46 +00:00
parent 13e63a82d2 a1857b407c
commit 03f3e7b3fc
80 changed files with 1176 additions and 853 deletions
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -220,7 +220,7 @@ def keyconfig_export(wm, kc, filepath):

 def keyconfig_test(kc):

-    def testEntry(self, kc, entry, src=None, parent=None):
+    def testEntry(kc, entry, src=None, parent=None):
        result = False

        def kmistr(kmi):