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
..
account_settings_preferences.xml	Merge commit '4.301' into issue-162-new	2012-09-11 02:00:27 -05:00
folder_settings_preferences.xml	Merge commit '4.119' into issue-162-new	2012-09-11 01:29:31 -05:00
font_preferences.xml	Made sure every PreferenceScreen has an associated key	2012-06-09 01:39:14 +02:00
global_preferences.xml	Merge branch 'master' into issue-162-new	2012-09-11 08:28:56 -05:00
providers.xml	updated Yahoo! Mail Variants	2012-05-05 00:21:06 -05:00
searchable.xml	k-9's search model isn't a websearch	2010-10-10 19:29:07 +00:00
unread_widget_info.xml	Tweak widget layout	2012-02-13 12:16:20 +01:00