* Merged with master

* Built ace Merge branch 'master' of github.com:ajaxorg/ace into feature/animscroll Conflicts: build/kitchen-sink.html build/src/ace-noconflict.js build/src/ace.js build/src/mode-c_cpp-noconflict.js build/src/mode-c_cpp.js build/src/mode-clojure-noconflict.js build/src/mode-clojure.js build/src/mode-coldfusion-noconflict.js build/src/mode-coldfusion.js build/src/mode-csharp-noconflict.js build/src/mode-csharp.js build/src/mode-css-noconflict.js build/src/mode-css.js build/src/mode-groovy-noconflict.js build/src/mode-groovy.js build/src/mode-haxe-noconflict.js build/src/mode-haxe.js build/src/mode-html-noconflict.js build/src/mode-html.js build/src/mode-java-noconflict.js build/src/mode-java.js build/src/mode-javascript-noconflict.js build/src/mode-javascript.js build/src/mode-json-noconflict.js build/src/mode-json.js build/src/mode-markdown-noconflict.js build/src/mode-markdown.js build/src/mode-php-noconflict.js build/src/mode-php.js build/src/mode-powershell-noconflict.js build/src/mode-powershell.js build/src/mode-scad-noconflict.js build/src/mode-scad.js build/src/mode-scala-noconflict.js build/src/mode-scala.js build/src/mode-svg-noconflict.js build/src/mode-svg.js build/src/mode-xml-noconflict.js build/src/mode-xml.js
crowdfavorite · Apr 8, 2012 · fddab9e · fddab9e
2 parents d6a1779 + d809d26
commit fddab9e
Show file tree

Hide file tree

Showing 335 changed files with 24,768 additions and 11,230 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@ node_modules/mime/
 node_modules/dryice/
 node_modules/uglify-js/
 node_modules/.bin/
-
+tool/node_modules/
 
 .git-ref
 npm-debug.log

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
@@ -218,9 +218,9 @@ function buildAce(aceProject, options) {
         compat: true,
         modes: [
             "css", "html", "javascript", "php", "coldfusion", "python", "lua", "xml", "ruby", "java", "c_cpp",
-            "coffee", "perl", "csharp", "haxe", "svg", "clojure", "scss", "json", "groovy",
+            "coffee", "perl", "csharp", "haxe", "liquid", "svg", "clojure", "scss", "json", "groovy",
             "ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql",
-            "text", "pgsql", "sh"
+            "text", "pgsql", "sh", "xquery"
         ],
         themes: [
             "chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",