Commit graph

3 commits

Author SHA1 Message Date
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
Fabian Jakobs
5383a297c2 comment out console.log statements as the log
module is not yet loaded at these points
2010-12-15 14:14:41 +01:00
Fabian Jakobs
f370a6f7fa remove lib directory from plugins otherwise the
modules cannot be loaded with nodejs
2010-12-13 10:40:40 +01:00
Renamed from plugins/pilot/lib/index.js (Browse further)