diff options
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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: |