1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aecf9b1e..6ac33e97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-20
+
+	* merged from LibSylph branch.
+	* libsylph/prefs_common.[ch]: added prefs_common_get().
+	* libsylph/filter.h: modified the prototype of filter_cond_new().
+	* libsylph/account.[ch]: added account_get_current_account().
+	* libsylph/mbox.c: use account_get_current_account().
+	* libsylph/procmime.[ch]: removed unused procmime_mimeinfo_replace().
+
 2006-11-16
 
 	* src/mainwindow.c: main_window_create(): modified the height of