aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2006-10-17 13:22:21 +0000
committernyamatongwe <unknown>2006-10-17 13:22:21 +0000
commit12828eb2ccb9eecf2ab76ae187ae472918cc31d9 (patch)
tree5150f985b971ee38af5066bb0d6e653cb1044e84
parent7f211947a86a35de25d75d9e1976407422918e5f (diff)
downloadscintilla-mirror-12828eb2ccb9eecf2ab76ae187ae472918cc31d9.tar.gz
Added ECMerge.
-rw-r--r--doc/ScintillaRelated.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html
index bc2edc87e..30495bf75 100644
--- a/doc/ScintillaRelated.html
+++ b/doc/ScintillaRelated.html
@@ -123,6 +123,11 @@
Projects using Scintilla
</h3>
<p>
+ <a href="http://www.elliecomputing.com/products/merge_overview.asp">ECMerge</a>
+ is a commercial graphical and batch diff / merge tool for Windows, Linux and Solaris
+ (aiming to target all major platforms).
+ </p>
+ <p>
<a href="http://pype.sourceforge.net/">PyPE</a>
is an editor written in Python with the wxPython GUI toolkit.
</p>