cketti fc8d2e9979 Merge branch 'master' into issue549 ... Conflicts: res/menu/accounts_context.xml res/menu/accounts_option.xml res/values/strings.xml src/com/fsck/k9/Account.java src/com/fsck/k9/activity/Accounts.java src/com/fsck/k9/activity/AsyncUIProcessor.java src/com/fsck/k9/activity/FolderList.java src/com/fsck/k9/activity/ImportListener.java src/com/fsck/k9/activity/K9Activity.java src/com/fsck/k9/activity/K9ListActivity.java src/com/fsck/k9/activity/MessageView.java src/com/fsck/k9/mail/store/ImapStore.java src/com/fsck/k9/mail/store/Pop3Store.java src/com/fsck/k9/mail/store/WebDavStore.java src/com/fsck/k9/mail/transport/SmtpTransport.java		2011-10-14 20:33:25 +02:00
..
ImapResponseParser.java	Merge pull request #55 from andrewgaul/stringbuilder	2011-10-06 09:04:43 -07:00
ImapStore.java	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
LocalStore.java	Added input validation for folder settings	2011-10-08 21:30:45 +02:00
LockableDatabase.java	Spelling corrections	2011-10-05 22:04:39 -07:00
Pop3Store.java	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
StorageManager.java	Removed unused imports	2011-03-26 06:43:39 +01:00
TrustManagerFactory.java	Big, scary massive "ant astyle" to get us back to something	2011-02-06 17:09:48 -05:00
UnavailableAccountException.java	Big, scary massive "ant astyle" to get us back to something	2011-02-06 17:09:48 -05:00
UnavailableStorageException.java	Big, scary massive "ant astyle" to get us back to something	2011-02-06 17:09:48 -05:00
WebDavStore.java	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00