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
..
AccountSettings.java	Enable remote search by default.	2012-09-29 07:48:49 -07:00
CheckBoxListPreference.java	astyle-d	2011-02-26 18:39:06 -06:00
Editor.java	Upgrade to SDK 15	2012-03-07 21:52:47 +01:00
FolderSettings.java	Add comment about increment settings version.	2012-04-08 15:27:39 -07:00
GlobalSettings.java	Merge branch 'master' into content_provider	2012-11-05 04:52:45 +01:00
IdentitySettings.java	Add comment about increment settings version.	2012-04-08 15:27:39 -07:00
Settings.java	Add global setting to enable/disable threaded view	2012-10-28 20:10:52 +01:00
SettingsExporter.java	Avoid using TreeMap methods introduced with API 9	2012-01-08 04:04:25 +01:00
SettingsImportExportException.java	Renamed StorageImportExportException to SettingsImportExportException	2011-10-14 06:00:10 +02:00
SettingsImporter.java	Make sure we always have an account name when importing settings	2012-05-06 21:02:41 +02:00
Storage.java	Log NumberFormatExceptions. Fix whitespace.	2012-09-29 07:53:34 -07:00
TimePickerPreference.java	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00