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
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -11,4 +11,5 @@
|
|||
.*.gz
|
||||
|
||||
# A handy place to put stuff that git should ignore:
|
||||
/ignore/
|
||||
/ignore/
|
||||
/build/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue