aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xmlpure
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/mode/xmlpure
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'imports/codemirror/mode/xmlpure')
-rw-r--r--imports/codemirror/mode/xmlpure/index.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html
index 721834ac..0fdac7e5 100644
--- a/imports/codemirror/mode/xmlpure/index.html
+++ b/imports/codemirror/mode/xmlpure/index.html
@@ -54,6 +54,5 @@ and we're inside a comment! -->
54 <p><b>@date</b>: August, 2011<br/> 54 <p><b>@date</b>: August, 2011<br/>
55 <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p> 55 <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p>
56 56
57 <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/xml</code>.</p>
58 </body> 57 </body>
59</html> 58</html>