[Gtk2hs-commit] gtk2hs ChangeLog,1.226,1.227

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32748

Modified Files:
	ChangeLog 
Log Message:
Removed conflict.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- ChangeLog	19 Aug 2004 15:00:55 -0000	1.226
+++ ChangeLog	4 Sep 2004 08:52:51 -0000	1.227
@@ -54,7 +54,7 @@
 	
 	* Makefile: No longer build gendoc or doc.  Build mogul after gtk2.
 
-2004-08-15  Axel Simon <A....@ke...>
+2004-08-16  Axel Simon <A....@ke...>
 
 	* mk/common.mk, mk/library.mk, mk/recurse.mk, Makefile: Make clean
 	and make distclean remove more files now.