1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-11 04:30:23 -05:00
k-9/res
ashley willis a62a5babca Merge commit '4.110' into issue-162-new
Conflicts:
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java

Resolutions:
    controller/MessagingController.java:
        public boolean isMoveCapable(final Account account)
        public boolean isMoveCapable(Message message)

    activity/setup/AccountSettings.java:
        private boolean mIsMoveCapable = false; // ASH i seem to have removed this, or renamed it to mIsAppendCapable
2012-09-10 23:38:13 -05:00
..
anim Animate the batch-operations toolbar (Imported from AOSP) 2010-11-07 19:40:42 +00:00
drawable Got rid of the ScrollView in MessageView 2012-02-21 05:07:01 +01:00
drawable-hdpi Got rid of the ScrollView in MessageView 2012-02-21 05:07:01 +01:00
layout Merge commit '4.110' into issue-162-new 2012-09-10 23:38:13 -05:00
layout-land Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
menu Added "advanced options" option and more support for local-only messages and folders: 2012-02-05 02:15:54 -06:00
values Merge commit '4.110' into issue-162-new 2012-09-10 23:38:13 -05:00
values-ca Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-cs Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-da Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-de Changed german translation 2012-02-22 19:37:21 +01:00
values-es Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-fi Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-fr Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-fr-rCA Improve French translation wording 2011-06-11 23:48:02 +02:00
values-gl Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-hu Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-it Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-ja Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-ko Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-nl Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-pl Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-pt-rBR Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-ru Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-sv Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-tr Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-zh-rCN Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
values-zh-rTW Removed settings for scrolling buttons 2012-02-21 15:16:36 +01:00
xml Merge commit '4.110' into issue-162-new 2012-09-10 23:38:13 -05:00