Merge branch 'master' of https://github.com/ajaxorg/ace

Browse source

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

...

This commit is contained in:

Joe Walker 2010-12-15 19:46:40 +00:00

parent 21dce2784e bf71127511

commit 0f505962d0

126 changed files with 3375 additions and 3518 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1083

plugins/cockpit/cli.js Normal file

View file

File diff suppressed because it is too large Load diff