1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-19 06:12:25 -05:00
k-9/src/com/fsck/k9/mail/internet
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
..
BinaryTempFileBody.java Big, scary massive "ant astyle" to get us back to something 2011-02-06 17:09:48 -05:00
DecoderUtil.java Prefer StringBuilder over StringBuffer 2011-10-05 21:50:31 -07:00
EncoderUtil.java ant astyle 2011-03-22 18:07:47 +11:00
Iso2022JpToShiftJisInputStream.java Could not handle iso-2022-jp streams which contain continuous escape 2011-03-19 18:05:07 +09:00
MimeBodyPart.java ant astyle 2011-07-02 15:18:43 -04:00
MimeHeader.java ant astyle 2011-03-22 18:07:47 +11:00
MimeMessage.java Prefer StringBuilder over StringBuffer 2011-10-05 21:50:31 -07:00
MimeMultipart.java Prefer StringBuilder over StringBuffer 2011-10-05 21:50:31 -07:00
MimeUtility.java Merge branch 'master' into issue549 2011-10-14 20:33:25 +02:00
TextBody.java Big, scary massive "ant astyle" to get us back to something 2011-02-06 17:09:48 -05:00