1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-08 04:08:15 -05:00
k-9/res/menu
ashley willis d9ecd6170b Merge branch 'master' into issue-162-new
Conflicts:
	res/menu/folder_list_option.xml
	res/menu/message_list_context.xml
	res/menu/message_list_option.xml
	res/menu/message_view_option.xml
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java
	src/com/fsck/k9/activity/setup/FolderSettings.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/preferences/AccountSettings.java

FUCK YEAH. though this code needs some serious review, please.
also, it will usually FC when opening a message, but if one is
open then next/prev will work just fine.
2012-09-11 08:28:56 -05:00
..
accounts_context.xml Revert "Context actionbar for the account screen." 2012-09-10 07:56:35 -04:00
accounts_option.xml Made "Settings" the last menu item in each activity 2012-09-10 16:48:54 +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 Revert "Add context action bar on FolderList activity." - We are not ready for this 2012-09-10 07:41:37 -04:00
folder_list_option.xml Merge branch 'master' into issue-162-new 2012-09-11 08:28:56 -05:00
folder_select_option.xml Merge branch 'master' into issue-162-new 2012-09-11 08:28:56 -05:00
manage_identities_context.xml Issue 117 2009-06-09 03:11:35 +00:00
manage_identities_option.xml cleanup; actually use the newly extracted icons 2012-09-09 13:39:14 -07:00
message_compose_option.xml cleanup; actually use the newly extracted icons 2012-09-09 13:39:14 -07:00
message_list_context.xml Merge branch 'master' into issue-162-new 2012-09-11 08:28:56 -05:00
message_list_option.xml Merge branch 'master' into issue-162-new 2012-09-11 08:28:56 -05:00
message_view_option.xml Merge branch 'master' into issue-162-new 2012-09-11 08:28:56 -05:00