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

Browse source

Conflicts:
	build/demo/kitchen-sink.js
	build/kitchen-sink.html

...

This commit is contained in:

Fabian Jakobs 2011-09-28 12:25:26 +02:00

parent 3a0ec51aef 8725f000b5

commit 7fd597a1b0

8 changed files with 8 additions and 8 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

2

build/demo/kitchen-sink.js

View file

File diff suppressed because one or more lines are too long