** Merge in notzed-messageinfo-branch, fix some minor conflicts.
authorNot Zed <NotZed@Ximian.com>
Fri, 12 Nov 2004 05:53:12 +0000 (05:53 +0000)
committerMichael Zucci <zucchi@src.gnome.org>
Fri, 12 Nov 2004 05:53:12 +0000 (05:53 +0000)
commit8a2e47d6532481b046683f2db2a1d6bc2a55960d
tree3fcc3f8a70964b0b1583a6c8ace991e9e88acc15
parentb6bf499430fce3887bd82fdf26e9de1dac9544eb
** Merge in notzed-messageinfo-branch, fix some minor conflicts.

2004-11-12  Not Zed  <NotZed@Ximian.com>

        ** Merge in notzed-messageinfo-branch, fix some minor conflicts.
62 files changed:
camel/ChangeLog
camel/Makefile.am
camel/camel-digest-folder.c
camel/camel-disco-folder.c
camel/camel-filter-driver.c
camel/camel-filter-search.c
camel/camel-folder-search.c
camel/camel-folder-summary.c
camel/camel-folder-summary.h
camel/camel-folder-thread.c
camel/camel-folder.c
camel/camel-folder.h
camel/camel-string-utils.c
camel/camel-string-utils.h
camel/camel-types.h
camel/camel-vee-folder.c
camel/camel-vee-folder.h
camel/camel-vee-store.c
camel/camel-vee-summary.c [new file with mode: 0644]
camel/camel-vee-summary.h [new file with mode: 0644]
camel/camel-vtrash-folder.c
camel/providers/Makefile.am
camel/providers/imap/camel-imap-folder.c
camel/providers/imap/camel-imap-message-cache.c
camel/providers/imap/camel-imap-store.c
camel/providers/imap/camel-imap-summary.c
camel/providers/imap/camel-imap-summary.h
camel/providers/imap/camel-imap-utils.c
camel/providers/imap4/camel-imap4-folder.c
camel/providers/imap4/camel-imap4-search.c
camel/providers/imap4/camel-imap4-store.c
camel/providers/imap4/camel-imap4-summary.c
camel/providers/imap4/camel-imap4-summary.h
camel/providers/imapp/ChangeLog
camel/providers/imapp/camel-imapp-driver.c
camel/providers/imapp/camel-imapp-folder.c
camel/providers/imapp/camel-imapp-store.c
camel/providers/imapp/camel-imapp-store.h
camel/providers/imapp/camel-imapp-summary.c
camel/providers/imapp/camel-imapp-summary.h
camel/providers/imapp/camel-imapp-utils.c
camel/providers/imapp/camel-imapp-utils.h
camel/providers/local/camel-local-summary.c
camel/providers/local/camel-local-summary.h
camel/providers/local/camel-maildir-folder.c
camel/providers/local/camel-maildir-store.c
camel/providers/local/camel-maildir-summary.c
camel/providers/local/camel-maildir-summary.h
camel/providers/local/camel-mbox-folder.c
camel/providers/local/camel-mbox-store.c
camel/providers/local/camel-mbox-summary.c
camel/providers/local/camel-mbox-summary.h
camel/providers/local/camel-mh-folder.c
camel/providers/local/camel-mh-store.c
camel/providers/local/camel-mh-summary.c
camel/providers/local/camel-mh-summary.h
camel/providers/local/camel-spool-folder.c
camel/providers/local/camel-spool-summary.c
camel/providers/local/camel-spool-summary.h
camel/providers/nntp/camel-nntp-folder.c
camel/providers/nntp/camel-nntp-summary.c
camel/providers/nntp/camel-nntp-summary.h