diff options
| author | Valerio Virgillito | 2012-03-06 16:17:54 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-06 16:17:54 -0800 |
| commit | c2805e03c84b6e598556fd06d1ede7aaeea7ce9c (patch) | |
| tree | b033421762f5e0fedbc8700bfc1f175c7c5cabcf /imports/codemirror/mode/gfm/gfm.js | |
| parent | 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff) | |
| download | ninja-c2805e03c84b6e598556fd06d1ede7aaeea7ce9c.tar.gz | |
Squashed commit FileIO-Build-Candidate into Master
Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/gfm/gfm.js')
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/gfm/gfm.js | 2 |
1 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 |