aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/clike/index.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/clike/index.html
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/clike/index.html')
-rw-r--r--imports/codemirror/mode/clike/index.html2
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>