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:
Fabian Jakobs 2011-01-14 15:21:38 +01:00
commit 18adea4251
26 changed files with 2725 additions and 127 deletions

3
.gitignore vendored
View file

@ -11,4 +11,5 @@
.*.gz
# A handy place to put stuff that git should ignore:
/ignore/
/ignore/
/build/