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
..
emoticons	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
downloading.html	Fixed HTML to get rid of some warnings	2011-04-21 00:02:11 +02:00
empty.html	Fixed HTML to get rid of some warnings	2011-04-21 00:02:11 +02:00
icon.png	Fix display of icon in About box on Android 2.1 and earlier	2011-01-30 15:11:16 +00:00
loading.gif	Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date.	2008-10-28 01:04:44 +00:00
loading.html	Fixed HTML to get rid of some warnings	2011-04-21 00:02:11 +02:00
test.html	Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date.	2008-10-28 01:04:44 +00:00