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/clike/index.html | |
parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/clike/index.html')
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/clike/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/clike/index.html b/imports/codemirror/mode/clike/index.html index 5e375ef4..5c327451 100755..100644 --- a/imports/codemirror/mode/clike/index.html +++ b/imports/codemirror/mode/clike/index.html | |||
@@ -96,6 +96,6 @@ void* zmq_thread_init(void* zmq_context, int signal_fd) { | |||
96 | <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> | 96 | <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> |
97 | (C code), <code>text/x-c++src</code> (C++ | 97 | (C code), <code>text/x-c++src</code> (C++ |
98 | code), <code>text/x-java</code> (Java | 98 | code), <code>text/x-java</code> (Java |
99 | code), <code>text/x-groovy</code> (Groovy code).</p> | 99 | code).</p> |
100 | </body> | 100 | </body> |
101 | </html> | 101 | </html> |