Merge branch 'upstream'

1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 09c84cd..b3e0a43 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-07-19  Till Kamppeter <till.kamppeter@gmx.net>
+
+	* foomatic-rip.in, foomatic-gswrapper.in: Fix for the fix on the
+	  regexp for reading the config file (Thanks to Hans-Dieter Kosch,
+	  hdkosch at t-online dot de, for this fix).
+
+2005-07-18  Till Kamppeter <till.kamppeter@gmx.net>
+
+	* foomatic-rip.in: In quiet mode (non-logging mode) $logh is
+	  closed in the beginning but was never opened (Thanks to
+	  Hans-Dieter Kosch, hdkosch at t-online dot de, for this fix).
+
+	* foomatic-gswrapper.in: Fixed quoting of single quotes (Thanks to
+	  Hans-Dieter Kosch, hdkosch at t-online dot de, for this fix).
+
+	* foomatic-rip.in, foomatic-gswrapper.in: Fixed regexp for reading
+	  the config file (Thanks to Hans-Dieter Kosch, hdkosch at
+	  t-online dot de, for this fix).
+
 2005-05-19  Till Kamppeter <till.kamppeter@gmx.net>
 
 	* foomatic-rip.in: Make EPSF files not be an exception when