aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-12-18 04:12:33 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-12-18 04:12:33 +0800
commit3a6cf44407bd0637f74f05d7745a889516948565 (patch)
tree8f16f55ded43af04bdc455960667a50fbac2750c /ChangeLog
parent7022ce8b5efa9c84621a6835611a3c8868a0eb16 (diff)
downloadgsoc2013-evolution-3a6cf44407bd0637f74f05d7745a889516948565.tar.gz
gsoc2013-evolution-3a6cf44407bd0637f74f05d7745a889516948565.tar.zst
gsoc2013-evolution-3a6cf44407bd0637f74f05d7745a889516948565.zip
** Evolution 2.21.4 releaseEVOLUTION_2_21_4
svn path=/trunk/; revision=34725
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da6b2ff630..23ca97c49c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+<<<<<<< .mine
+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: