jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mozilla/master'

Browse source 
Conflicts:
	lib/ace/edit_session.js
	lib/ace/layer/text.js
This commit is contained in:
Fabian Jakobs 2011-04-26 19:14:16 +02:00
commit 103255f4d2
34 changed files with 1790 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -450,7 +450,7 @@ bg. Blockquote!
</script>
<input id="cockpitInput" type="text"/>
<input id="gcliInput" type="text"/>
<script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
<script src="demo/boot.js" type="text/javascript"></script>