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

Merge remote-tracking branch 'remotes/origin/master' into mode_live_edit

Browse source 
Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/mode/coffee_highlight_rules_test.js
This commit is contained in:
nightwing 2012-10-03 22:43:37 +04:00
commit 3d6ce5fdf5
89 changed files with 3929 additions and 12705 deletions
Download patch file Download diff file Expand all files Collapse all files

1
demo/kitchen-sink/modelist.js
View file

@ -68,6 +68,7 @@ var modesByName = {
tcl: ["Tcl" , "tcl"],
text: ["Text" , "txt"],
textile: ["Textile" , "textile"],
typescript: ["Typescript" , "typescript|ts|str"],
xml: ["XML" , "xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
xquery: ["XQuery" , "xq"],
yaml: ["YAML" , "yaml"]