Index: www/links.html =================================================================== --- www/links.html (revision 21026) +++ www/links.html (working copy) @@ -172,6 +172,12 @@ >http://esvn.umputun.com/
+Guiffy Source Diff/Merge Tool - an advanced cross-platform
+ diff/merge tool. (Note that this is not an Open Source project.)
+
+ http://www.guiffy.com/
+
JDeveloper - Oracle's free integrated development environment with end-to-end support for modeling, developing, debugging, optimizing, and deploying Java applications and Web