Merge branch 'master' of https://github.com/iebuggy/ace into iebuggy-master

Browse source

Conflicts:
	lib/ace/mode/php_highlight_rules.js

...

This commit is contained in:

Fabian Jakobs 2011-07-19 13:10:52 +02:00

parent aef91c2d31 12659f939a

commit c7aace75b0

1 changed files with 824 additions and 376 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

1200

lib/ace/mode/php_highlight_rules.js

View file

File diff suppressed because it is too large Load diff