Permalink
Browse files

Merge master

  • Loading branch information...
2 parents 27629c0 + fddab9e commit fc4625e1b6014d29e600467bec78875221fc76f5 @gjtorikian gjtorikian committed Apr 10, 2012
Showing 335 changed files with 24,914 additions and 11,261 deletions.
View
@@ -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
View
@@ -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",
Oops, something went wrong.

0 comments on commit fc4625e

Please sign in to comment.