aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/gfm
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-07 10:32:20 -0800
committerNivesh Rajbhandari2012-03-07 10:32:20 -0800
commitf5b0162a9b148589f0ccc65a0332695ea6fd6be3 (patch)
treee62ae1bc8a14dfa60cca05d40227c13dbfa2746a /imports/codemirror/mode/gfm
parent443a23289171bb72324e740d8eaa041968a1de99 (diff)
parentcef07085443b7c31e878daaad083b7408c57e104 (diff)
downloadninja-f5b0162a9b148589f0ccc65a0332695ea6fd6be3.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'imports/codemirror/mode/gfm')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/gfm.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/index.html0
2 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/gfm/gfm.js b/imports/codemirror/mode/gfm/gfm.js
index 1e9d7d87..01afed7b 100755..100644
--- a/imports/codemirror/mode/gfm/gfm.js
+++ b/imports/codemirror/mode/gfm/gfm.js
@@ -8,7 +8,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
8 "c++": "text/x-c++src", 8 "c++": "text/x-c++src",
9 java: "text/x-java", 9 java: "text/x-java",
10 csharp: "text/x-csharp", 10 csharp: "text/x-csharp",
11 "c#": "text/x-csharp", 11 "c#": "text/x-csharp"
12 }; 12 };
13 13
14 // make this lazy so that we don't need to load GFM last 14 // make this lazy so that we don't need to load GFM last
diff --git a/imports/codemirror/mode/gfm/index.html b/imports/codemirror/mode/gfm/index.html
index b27d49ab..b27d49ab 100755..100644
--- a/imports/codemirror/mode/gfm/index.html
+++ b/imports/codemirror/mode/gfm/index.html