ashley willis 5b772ef171 Merge commit '4.114' into issue-162-new ... Conflicts: src/com/fsck/k9/K9.java src/com/fsck/k9/activity/MessageView.java enabled isCopyCapable in src/com/fsck/k9/controller/MessagingController.java		2012-09-11 01:09:08 -05:00
..
accounts_context.xml	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
accounts_option.xml	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
disabled_accounts_context.xml	Add dialog to ask for server passwords after import	2011-10-17 04:34:26 +02:00
folder_context.xml	Added folder rename and folder delete for IMAP and POP3.	2012-01-12 03:51:25 -06:00
folder_list_option.xml	IMAP folder creation.	2012-01-09 02:30:06 -06:00
folder_select_option.xml	IMAP folder creation.	2012-01-09 02:30:06 -06:00
manage_identities_context.xml	Issue 117	2009-06-09 03:11:35 +00:00
manage_identities_option.xml	Issue 117	2009-06-09 03:11:35 +00:00
message_compose_option.xml	Add menu image for read/reply receipt.	2012-04-08 16:54:21 -07:00
message_list_context.xml	Added "advanced options" option and more support for local-only messages and folders:	2012-02-05 02:15:54 -06:00
message_list_option.xml	Merge commit '4.113' into issue-162-new	2012-09-11 00:56:06 -05:00
message_view_option.xml	Added "advanced options" option and more support for local-only messages and folders:	2012-02-05 02:15:54 -06:00