diff options
author | Jon Reid | 2012-05-04 14:56:24 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-04 14:56:24 -0700 |
commit | a6dd2917edcfeca1be7553e03281ddd538422ae1 (patch) | |
tree | e6846626bf1e967e80bcd652f6a76bb97abb1789 /imports/codemirror/mode/clike | |
parent | 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff) | |
parent | 8964e070fa760d23c2de272ca36b8d9beba6007d (diff) | |
download | ninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/clike')
-rw-r--r-- | 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 5c327451..64d02f11 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).</p> | 99 | code), <code>text/x-csharp</code> (C#).</p> |
100 | </body> | 100 | </body> |
101 | </html> | 101 | </html> |