Merge remote branch 'jviereck/keymapping'
Conflicts: .gitignore .gitmodules LICENSE demo/boot.js demo/startup.js lib/ace/editor.js support/cockpit
This commit is contained in:
commit
18adea4251
26 changed files with 2725 additions and 127 deletions
5
.gitmodules
vendored
5
.gitmodules
vendored
|
|
@ -21,7 +21,10 @@
|
|||
url = git://github.com/tautologistics/node-htmlparser.git
|
||||
[submodule "support/cockpit"]
|
||||
path = support/cockpit
|
||||
url = git://github.com/ajaxorg/cockpit.git
|
||||
url = git://github.com/mozilla/cockpit.git
|
||||
[submodule "support/pilot"]
|
||||
path = support/pilot
|
||||
url = git://github.com/ajaxorg/pilot.git
|
||||
[submodule "support/dryice"]
|
||||
path = support/dryice
|
||||
url = git://github.com/mozilla/dryice.git
|
||||
Loading…
Add table
Add a link
Reference in a new issue