# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1208135063 -7200
# Node ID 74e7b7fa02feb39cba5d937aa7195e538818f118
# Parent  38a1d18e34d70c1647c414094bdb4c1473c00ab7# Parent  49df245c32103fc26dade16c3fc9eae3f000fe51
merge from eclipse repo

diff -r 38a1d18e34d7 -r 74e7b7fa02fe README.txt
--- a/README.txt	Mon Apr 14 03:03:44 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-foobar
-this is an edit from eclipse
-this is another edit
-and yet another one
diff -r 38a1d18e34d7 -r 74e7b7fa02fe README2.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README2.txt	Mon Apr 14 03:04:23 2008 +0200
@@ -0,0 +1,4 @@
+foobar
+this is an edit from eclipse
+this is another edit
+and yet another one