From 12828eb2ccb9eecf2ab76ae187ae472918cc31d9 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Tue, 17 Oct 2006 13:22:21 +0000
Subject: Added ECMerge.

---
 doc/ScintillaRelated.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html
index bc2edc87e..30495bf75 100644
--- a/doc/ScintillaRelated.html
+++ b/doc/ScintillaRelated.html
@@ -122,6 +122,11 @@
     <h3>
        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.
-- 
cgit v1.2.3