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

Merge branch 'master' of https://github.com/desoi/ace into desoi-master

Browse source 
Conflicts:
	Makefile.dryice.js
This commit is contained in:
Fabian Jakobs 2012-01-06 11:39:27 +01:00
commit cf6f4d88d3
6 changed files with 772 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.dryice.js
View file

@ -220,7 +220,7 @@ function buildAce(aceProject, options) {
modes: [
"css", "html", "javascript", "php", "coldfusion", "python", "lua", "xml", "ruby", "java", "c_cpp",
"coffee", "perl", "csharp", "haxe", "svg", "clojure", "scss", "json", "groovy",
"ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql"
"ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql", "pgsql"
],
themes: [
"chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",