1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-10 05:08:18 -05:00
k-9/res/xml
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
..
account_settings_preferences.xml Merge commit '4.110' into issue-162-new 2012-09-10 23:38:13 -05:00
folder_settings_preferences.xml Added "advanced options" option and more support for local-only messages and folders: 2012-02-05 02:15:54 -06:00
font_preferences.xml Added font size setting for text input fields in MessageCompose 2012-01-12 01:05:01 +01:00
global_preferences.xml Added "advanced options" option and more support for local-only messages and folders: 2012-02-05 02:15:54 -06:00
providers.xml account setup changes: 2012-02-16 18:35:25 -06:00
searchable.xml k-9's search model isn't a websearch 2010-10-10 19:29:07 +00:00
unread_widget_info.xml Tweak widget layout 2012-02-13 12:16:20 +01:00