aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/stex
diff options
context:
space:
mode:
authorEric Guzman2012-03-12 15:33:04 -0700
committerEric Guzman2012-03-12 15:33:04 -0700
commit7e3161153b87b891875ac65368a19aed12909fa3 (patch)
treeb80f48d711a9729fc39dbbdff28c4f0620e7302d /imports/codemirror/mode/stex
parent7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'imports/codemirror/mode/stex')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/stex/index.html2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/stex/stex.js0
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