diff options
author | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
commit | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch) | |
tree | 6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /imports/codemirror/mode/stex | |
parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/stex')
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/stex/index.html | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/stex/stex.js | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/stex/index.html b/imports/codemirror/mode/stex/index.html index ccd9dd83..e49289e9 100755..100644 --- a/imports/codemirror/mode/stex/index.html +++ b/imports/codemirror/mode/stex/index.html | |||
@@ -89,7 +89,7 @@ | |||
89 | var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); | 89 | var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); |
90 | </script> | 90 | </script> |
91 | 91 | ||
92 | <p><strong>MIME types defined:</strong> <code>text/stex</code>.</p> | 92 | <p><strong>MIME types defined:</strong> <code>text/x-stex</code>.</p> |
93 | 93 | ||
94 | </body> | 94 | </body> |
95 | </html> | 95 | </html> |
diff --git a/imports/codemirror/mode/stex/stex.js b/imports/codemirror/mode/stex/stex.js index bb47fb45..bb47fb45 100755..100644 --- a/imports/codemirror/mode/stex/stex.js +++ b/imports/codemirror/mode/stex/stex.js | |||