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

This commit is contained in:
Garen Torikian 2012-09-28 07:20:48 -07:00
commit e2d4b6c296
3 changed files with 7 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

View file

@ -485,6 +485,12 @@ tests for the highlighting.</p>
style="position: relative; left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="doc/site/images/zorba-logo.png"
style="position: relative; left: -5px; top: 16px; background: #fff;
padding: 6px 4px 6px 6px;" />
<a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a>
</li>
<li>
<a href="https://github.com/Gozala/sky-edit">Sky Edit</a>
</li>
@ -497,9 +503,6 @@ tests for the highlighting.</p>
<li>
<a href="http://demo.qooxdoo.org/devel/playground/#">Qooxdoo playground</a>
</li>
<li>
<a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a>
</li>
<li>
<a href="http://ext.radiantcms.org/extensions/264-ace">Radiant CMS</a>
</li>

View file

@ -28,8 +28,7 @@
"lib": "lib/ace"
},
"scripts": {
"test": "node lib/ace/test/all.js",
"postinstall": "node ./install.js"
"test": "node lib/ace/test/all.js"
},
"config": {
"github.com/sourcemint/bundler-js/0/-meta/config/0": {