2 Commits

Author	SHA1	Message	Date
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
Jesse Vincent	a4381696f9	Support Emoji for DoCoMo. ... Emoji icons are derived from http://start.typepad.jp/typecast/	2010-08-02 01:24:40 +00:00