diff options
author | Valerio Virgillito | 2012-05-03 23:01:31 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-03 23:01:31 -0700 |
commit | 60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (patch) | |
tree | 9bfa4cc0fdb3a39abf151c05d013f2cde7aad296 /imports/codemirror/mode/clike/index.html | |
parent | dca94d9d1e2a6a113356b685df991472ea3e5576 (diff) | |
parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
download | ninja-60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e.tar.gz |
Merge branch 'refs/heads/master' into tag-2.0
Diffstat (limited to 'imports/codemirror/mode/clike/index.html')
-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> |