--- psiconv/trunk/ChangeLog	2005/02/25 21:02:30	256
+++ psiconv/trunk/ChangeLog	2005/11/15 14:59:54	269
@@ -1,3 +1,22 @@
+2005-11-15  Frodo Looijaard  <frodo@shire>
+
+	* lib/psiconv/parse_common.c, lib/psiconv/unicode.c:
+	(Frodo) Resolved a few spurious warnings
+
+	* program/psiconv/gen_html4.c, program/psiconv/gen_xhtml.c:
+	(Frodo) Fixed compilation problem on newer systems: ffs was an already used
+	        symbol.
+
+2005-02-25  Frodo Looijaard  <frodo@shire>
+
+	* ChangeLog, NEWS, configure.in, debian/changelog, program/psiconv-config/psiconv-config:
+	(Frodo) Update for 0.9.7
+
+	* configure.in, program/psiconv/magick-aux.c, program/psiconv/magick-aux.h:
+	(Frodo) Support ImageMagick 6
+
+	* INSTALL, NEWS, debian/changelog: (Frodo) Pending changes
+
 2005-02-25 21:36  frodo
 
 	* configure.in, program/psiconv/magick-aux.c,