Joe Steele 3142a9a225 Merge branch 'master' into tls-client-cert-auth ... Conflicts: src/com/fsck/k9/fragment/ConfirmationDialogFragment.java		2014-07-04 18:08:07 -04:00
..
AccountSettings.java	Fix a number of build warnings.	2013-02-04 11:18:49 +01: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	Fix a number of build warnings.	2013-02-04 11:18:49 +01:00
GlobalSettings.java	Issue 6372: Add preference for setting timezone to UTC.	2014-05-27 07:53:50 -07:00
IdentitySettings.java	Add comment about increment settings version.	2012-04-08 15:27:39 -07:00
Settings.java	Fixes for cketti's code review on pull req #472	2014-06-13 17:49:26 -07:00
SettingsExporter.java	Use localized strings for authentication type	2014-02-25 15:22:35 -05:00
SettingsImportExportException.java	Fix a number of build warnings.	2013-02-04 11:18:49 +01:00
SettingsImporter.java	Client Certificate Authentication	2014-06-05 21:03:18 +02:00
Storage.java	Log NumberFormatExceptions. Fix whitespace.	2012-09-29 07:53:34 -07:00
TimePickerPreference.java	Use Locale.US where appropriate	2014-03-03 10:40:23 -05:00