Commit Graph

3 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 bc8e56262e Icon updates from Pierre-Luc Auclair 2010-11-20 05:08:32 +00:00
Jesse Vincent db2b177a79 Relabeled the "Choose Identity" menu item in message compose to be a bit
more obvious to end users.

Split out the "choose identity" icon from the "cc" icon, though they're
still the same image, at least they're logically separate
2010-11-14 15:36:52 +00:00