# HG changeset patch
# User joachim99
# Date 1065467577 0
# Node ID 266aeefa1b115aa40d2002ed083cfe07763f7afe
# Parent  31907692deeecb777c68b84f9049cacc34e35b2e
KDiff3 version 0.9.70

diff -r 31907692deee -r 266aeefa1b11 kdiff3/.cvsignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/.cvsignore	Mon Oct 06 19:12:57 2003 +0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff -r 31907692deee -r 266aeefa1b11 kdiff3/Makefile.cvs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/Makefile.cvs	Mon Oct 06 19:12:57 2003 +0000
@@ -0,0 +1,10 @@
+all: 
+	@echo "This Makefile is only for the CVS repository"
+	@echo "This will be deleted before making the distribution"
+	@echo ""
+	$(MAKE) -f admin/Makefile.common cvs
+
+dist:
+	$(MAKE) -f admin/Makefile.common dist
+
+.SILENT:
diff -r 31907692deee -r 266aeefa1b11 kdiff3/TODO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/TODO	Mon Oct 06 19:12:57 2003 +0000
@@ -0,0 +1,11 @@
+This file contains some feature-wishes for future KDiff3-versions.
+
+TODO
+====
+
+- Automatic line wrap in the difference windows
+- Printing of the diff-windows (requires automatic line wrap)
+- Undo function in the merge-editor.
+- Diff should allow to treat C/C++-comments as white space.
+- A inserted or removed linefeed should be detected and treated like white space.
+
diff -r 31907692deee -r 266aeefa1b11 kdiff3/configure.files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/configure.files	Mon Oct 06 19:12:57 2003 +0000
@@ -0,0 +1,2 @@
+./admin/configure.in.min
+configure.in.in