aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 23ca97c49c..08b766a68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,16 @@
-<<<<<<< .mine
+2007-12-18 Srinivasa Ragavan <sragavan@novell.com>
+
+ * configure.in: Version bump to 2.21.5
+
2007-12-17 Srinivasa Ragavan <sragavan@novell.com>
* NEWS, configure.in: evolution 2.21.4 release.
-=======
2007-12-17 Matthew Barnes <mbarnes@redhat.com>
* configure.in:
Bump eds_minimum_version to 2.21.4 for new Camel functions.
->>>>>>> .r34724
2007-12-15 Matthew Barnes <mbarnes@redhat.com>
* configure.in:
diff --git a/configure.in b/configure.in
index 629ebede6b..d84c49e324 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(evolution, 2.21.4, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.21.5, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
AC_CONFIG_SRCDIR(README)
# Some requirements have versioned package names