Merge branch 'feature/shadowgutter'

Browse source

Conflicts:
	build/kitchen-sink.html
	build/src/ace-noconflict.js
	build/src/ace.js
	lib/ace/virtual_renderer.js

...

This commit is contained in:

Fabian Jakobs 2012-04-11 17:23:45 +02:00

parent d3f147cc72 2208ccdd48

commit 770ab82cbf

190 changed files with 1202 additions and 544 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/src/mode-javascript-noconflict.js

View file

File diff suppressed because one or more lines are too long