[balsa/threading: 16/16] ChangeLog: Clean up after rebase

[Peter Bloomfield <peterb src gnome org>]

commit 50d210066e02cb944178399b9408c5efaed368c5
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Aug 29 16:17:54 2018 -0400

    ChangeLog: Clean up  after rebase

 ChangeLog | 41 -----------------------------------------
 1 file changed, 41 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 22fb544bf..a7293c8e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,47 +27,6 @@
        * src/pref-manager.c: clean up menu
        * src/save-restore.c: migrate IMAP mailboxes to IMAP folders
 
-2018-08-19  Peter Bloomfield  <pbloomfield bellsouth net>
-
-       Simplify threading
-
-       Change THREADING_SIMPLE to mean JWZ without the 'subject gather'
-       phase, and change the UI to enable or disable threading instead
-       of offering the choice of threading algorithms.
-
-       Still to do: add UI for choosing JWZ instead of SIMPLE.
-
-       * libbalsa/mailbox.c (lbm_need_threading_idle_cb),
-       (libbalsa_mailbox_set_view_filter), (lbm_set_threading_idle_cb),
-       (lbm_set_threading), (libbalsa_mailbox_set_threading): do not
-       pass threading type to _set_threading, just get it from the
-       view.
-       * libbalsa/mailbox.h: ditto.
-       * libbalsa/mailbox_local.c (libbalsa_mailbox_local_close_mailbox),
-       (lbml_set_threading), (lbml_set_threading_idle_cb),
-       (libbalsa_mailbox_local_set_threading), (lbm_local_thread_idle),
-       (lbml_thread_messages), (lbml_unthread_message),
-       (lbml_threading_flat): change THREADING_SIMPLE to mean JWZ
-       without the 'subject gather' phase, and simplify THREADING_FLAT.
-       * src/balsa-index.c (balsa_index_set_threading_type): do nothing
-       if the type has not changed.
-       * src/balsa-index.h: the threading type is
-       LibBalsaMailboxThreadingType.
-       * src/main-window.c (threading_change_state),
-       (bw_add_win_action_entries), (balsa_window_new),
-       (bw_enable_expand_collapse), (bw_enable_mailbox_menus),
-       (bw_set_thread_messages), (bw_real_open_mbnode_idle_cb): remove
-       the threading type radio buttons, and replace them with a
-       'Thread messages' check-box.
-       * src/main.c (balsa_get_stats): new API for
-       libbalsa_mailbox_set_threading.
-       * src/pref-manager.c (update_view_defaults), (apply_prefs),
-       (set_prefs), (pm_grid_add_threading_group),
-       (open_preferences_manager): remove the threading type combo box,
-       and replace it with a 'Thread messages by default' check-box.
-       * ui/main-window.ui: remove the threading type radio buttons,
-       and replace them with a 'Thread messages' check-box.
-
 2018-08-27  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Apply threading changes on 'Update'