cketti d209c0cce3 Merge branch 'master' into content_provider ... Conflicts: src/com/fsck/k9/activity/MessageList.java src/com/fsck/k9/fragment/MessageListFragment.java		2012-11-05 04:52:45 +01:00
..
account_settings_preferences.xml	remove vestiges of a deleted setting	2012-10-09 21:31:19 -04:00
folder_settings_preferences.xml	Made sure every PreferenceScreen has an associated key	2012-06-09 01:39:14 +02: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 content_provider	2012-11-05 04:52:45 +01:00
providers.xml	Add the new outlook.com domain to our list of preconfigured domains.	2012-10-01 15:07:48 +02: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