From 8cb514d6dd9497893a35a089d07a132d51263ee7 Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@src.gnome.org>
Date: Thu, 10 Aug 2000 17:30:50 +0000
Subject: Merge with camel-async.

svn path=/trunk/; revision=4687
---
 ChangeLog | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4ddf6a7ee0..b55754d5f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,14 @@
 
 	* data/Makefile.am (mime_DATA): add evolution.keys
 
+2000-08-09  Peter Williams  <peterw@helixcode.com>
+
+	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
+
+2000-08-08  Peter Williams  <peterw@helixcode.com>
+
+	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
+
 2000-08-05  Dan Winship  <danw@helixcode.com>
 
 	* tools/verify-evolution-install.sh: Look for oafinfo files in
@@ -84,6 +92,11 @@
 
 	* calendar/gui/event-editor.c: Typo fix
 
+2000-07-20  Peter Williams  <peterw@helixcode.com>
+
+	* configure.in (THREADS_CFLAGS): Make threads mandatory
+	again.
+
 2000-07-19  Fatih Demir	<kabalak@gmx.net>
 	
 	* evolution.desktop & data/evolution.desktop: Added
@@ -97,6 +110,11 @@
 	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
 	Added checks for gtk-doc.
 
+2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
+
+	* configure.in (end): Bigass warnings for camel-async branch
+	(remove them later).
+
 2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
 
 	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-- 
cgit