Merge branch 'stateless_runvm' of github.com:ajaxorg/cloud9 into stat…

…eless_runvm
hanselke · Apr 3, 2012 · 113f9c3 · 113f9c3
2 parents 36a0aa8 + 5bc88e8
commit 113f9c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/client/ext/keybindings_default/default_mac.js b/client/ext/keybindings_default/default_mac.js
@@ -90,8 +90,8 @@ return keys.onLoad({
             "tab8": "Command-8",
             "tab9": "Command-9",
             "revealtab": "Command-Shift-L",
-            "nexttab": "Command-Tab|Option-Tab",
-            "previoustab": "Command-Shift-Tab|Option-Shift-Tab"
+            "nexttab": "Option-Tab",
+            "previoustab": "Option-Shift-Tab"
         },
         "tabsessions" : {
             "savetabsession": "Command-Alt-S"

diff --git a/server/cloud9/ext/shell/shell.js b/server/cloud9/ext/shell/shell.js
@@ -122,7 +122,8 @@ sys.inherits(ShellPlugin, Plugin);
                  _self.sendResult(0, message.command, commands);
              });
     };
-
+
+    this.mv    =
     this.pwd   =
     this.mkdir =
     this.rm    =

diff --git a/support/ace b/support/ace