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 |
|
cketti
|
203dab5c64
|
Revert changes for issue 549 (import/export settings).
The feature will be polished in branch "issue549".
|
2011-02-28 22:55:34 +01:00 |
|
danapple
|
807f85d38e
|
Astyling recent change
|
2011-02-27 11:10:32 -06:00 |
|
danapple
|
f0a8d2edee
|
Update date formatter on when importing preferences.
|
2011-02-26 19:28:47 -06:00 |
|
danapple
|
ad3dd07a7a
|
astyle-d
|
2011-02-26 18:39:06 -06:00 |
|
Jesse Vincent
|
0ca6adfbf8
|
move DateFormatter from Activity to Helper
|
2011-01-10 17:47:16 +00:00 |
|