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

Merge remote-tracking branch 'remotes/megshark/master'

Browse source 
Conflicts:
	Makefile.dryice.js
	demo/kitchen-sink/demo.js
This commit is contained in:
nightwing 2012-05-23 22:08:18 +04:00
commit d50f526495
5 changed files with 222 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.dryice.js
View file

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