Merge branch 'master' of https://github.com/ajaxorg/ace

Conflicts: build_support/mini_require.js support/cockpit support/pilot
2011-03-17 12:54:50 +00:00 · 2011-03-17 12:54:50 +00:00 · a6aa2ec6ee
commit a6aa2ec6ee
parent 88a335b500 af5d11770f
111 changed files with 7507 additions and 3756 deletions
--- a/support/cockpit
+++ b/support/cockpit
@ -1 +1 @@
-Subproject commit aab480b64c653608e764b67bb5e19bed99395e7e
+Subproject commit 76dcb8a2e99df7e26be835ceccc927ec9826773d