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

Browse source

Conflicts:
	build/demo/kitchen-sink-uncompressed.js
	build/demo/kitchen-sink.js
	build/src/ace-uncompressed.js
	build/src/ace.js

...

This commit is contained in:

Lee Gao 2011-08-19 18:54:25 -04:00

parent db9862b3f7 3d277c782f

commit 68f3a31b8e

14 changed files with 4052 additions and 5428 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

2806

build/src/ace-uncompressed.js

View file

File diff suppressed because it is too large Load diff

2

build/src/ace.js

View file

File diff suppressed because one or more lines are too long

2

build/src/worker-coffee.js

View file

File diff suppressed because one or more lines are too long

2

build/src/worker-css.js

View file

File diff suppressed because one or more lines are too long

2

build/src/worker-javascript.js

View file

File diff suppressed because one or more lines are too long