Commit graph

6 commits

Author SHA1 Message Date
Fabian Jakobs
18adea4251 Merge remote branch 'jviereck/keymapping'
Conflicts:
	.gitignore
	.gitmodules
	LICENSE
	demo/boot.js
	demo/startup.js
	lib/ace/editor.js
	support/cockpit
2011-01-14 15:21:38 +01:00
Kevin Dangoor
1d45d8baad add MPL to the license file 2011-01-12 22:22:44 -05:00
Fabian Jakobs
03cf6c84fb replace LGPL license file with pointers to the three licenses 2011-01-12 10:14:48 +01:00
Fabian Jakobs
81df50da2d move files one level up 2010-10-27 12:39:54 +02:00
Fabian Jakobs
112b5f76ed split repos 2010-10-27 12:04:58 +02:00
mikedeboer
6f8f346e40 added license info (LGPL) to editor files 2010-09-22 14:55:30 +02:00