Joe Walker 0f505962d0 Merge branch 'master' of https://github.com/ajaxorg/ace ... Conflicts: plugins/cockpit/cli.js plugins/cockpit/lib/ui/plain.js plugins/cockpit/ui/plain.css plugins/cockpit/ui/plain.js plugins/pilot/canon.js plugins/pilot/lib/commands/history.js		2010-12-15 19:46:40 +00:00
..
boot.js	Merge branch 'master' of https://github.com/ajaxorg/ace	2010-12-15 19:46:40 +00:00
demo_startup.js	put functions from old "ace/lib" modules directly	2010-12-15 11:04:14 +01:00
logo.png	move files one level up	2010-10-27 12:39:54 +02:00
require.js	upgrade to requirejs - warning the copy in demo is only a partial upgrade to fix the immediate text loading issue	2010-11-15 12:59:24 +00:00