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

Merge https://github.com/ajaxorg/ace

Browse source 
Conflicts:
	Makefile.dryice.js
	build/demo/kitchen-sink/kitchen-sink-uncompressed.js
	build/kitchen-sink.html
	build/src/ace-noconflict.js
	build/src/ace.js
	demo/kitchen-sink/demo.js
This commit is contained in:
William Candillon 2012-03-31 10:00:21 +02:00
commit bdb21ff646
437 changed files with 65145 additions and 31979 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/kitchen-sink.html
View file

@ -11,7 +11,11 @@
Ace
version 0.2.0
<<<<<<< HEAD
commit 517e88f2f077263e49159c7b1742b5f3a7c605b4
=======
commit 0fb6590f265d338b4aa70430713767b93e540f11
>>>>>>> 9b4f97565d0c02c561a2e275d567d8611b91465f
-->
@ -213,7 +217,7 @@
-->
<script src="demo/kitchen-sink/kitchen-sink-uncompressed.js" data-ace-base="demo/kitchen-sink" type="text/javascript" charset="utf-8"></script>
<script src="demo/kitchen-sink/kitchen-sink-uncompressed.js" data-ace-suffix="-uncompressed.js" data-ace-base="demo/kitchen-sink" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
require("kitchen-sink/demo");
</script>