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

@ -1 +1 @@
Subproject commit 1b727ac77facdae8c0ff95cffd5dc8be1df30e94
Subproject commit 36c55c39e8ede94e964364e01ab5308f3f51c2eb

1
support/dryice Submodule

@ -0,0 +1 @@
Subproject commit 89f99bb65c66d0c25d461ab4af5743ef1676a04d