Merge branch 'haxesyntax'

Conflicts: demo/kitchen-sink/demo.js
2011-11-15 11:38:43 +01:00 · 2011-11-15 11:38:43 +01:00 · c97fc93a71
commit c97fc93a71
parent 112c5e8959 6d06b3bbd0
6 changed files with 183 additions and 1 deletions
--- a/build_support/boot_textarea.js
+++ b/build_support/boot_textarea.js
@ -416,6 +416,7 @@ function setupSettingPanel(settingDiv, settingOpener, api, options) {
            clojure:    "Clojure",
            ocaml:      "OCaml",
            csharp:     "C#",
+            haxe:       "haXe",
            svg:        "SVG",
            textile:    "Textile",
            groovy:     "Groovy",