1 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9637a39d..29332657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-01  Shaun McCance  <shaunm@gnome.org>
+
+	* NEWS
+	* configure.in:
+	- Version 2.10.0
+
+	* po/ChangeLog:
+	- Removed stray CVS conflict marker
+
 2005-04-30  Paolo Borelli  <pborelli@katamail.com>
 
 	yelp-bookmarks.c: constify some vars.