changeset 20:242ed49b42c9

pulled pending changes
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 23 Jun 2008 09:41:10 +0200
parents b47b09a23811 (diff) 9436877e9b54 (current diff)
children e1a9127a7d57
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Jun 17 12:22:15 2008 +0200
+++ b/.hgignore	Mon Jun 23 09:41:10 2008 +0200
@@ -1,5 +1,6 @@
 syntax: glob
 *.class
+target
 
 syntax: regexp
 ^\.project$
\ No newline at end of file
--- a/README2.txt	Tue Jun 17 12:22:15 2008 +0200
+++ b/README2.txt	Mon Jun 23 09:41:10 2008 +0200
@@ -2,3 +2,4 @@
 this is an edit from eclipse
 this is another edit
 and yet another one
+barbaz
\ No newline at end of file