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

[blender-staging.git] / release / scripts / modules / bpy_extras / keyconfig_utils.py

diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index e87db6599188bf18d083f5ac90d5f7b0bde41d73..49b6047e2902285998326becab6bf5b051b56bbd 100644 (file)
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -92,6 +92,8 @@ KM_HIERARCHY = [
     ('Script', 'SCRIPTS_WINDOW', 'WINDOW', []),
     ('Text', 'TEXT_EDITOR', 'WINDOW', []),
     ('Console', 'CONSOLE', 'WINDOW', []),
+    ('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
+    ('Clip Globals', 'CLIP_EDITOR', 'WINDOW', []),
 
     ('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
     ('Gesture Border', 'EMPTY', 'WINDOW', []),