diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/res/menu | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/menu/attachment_choices.xml (renamed from res/menu/attachment_choices.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/choose_contact.xml (renamed from res/menu/choose_contact.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/conference_context.xml (renamed from res/menu/conference_context.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/contact_context.xml (renamed from res/menu/contact_context.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/contact_details.xml (renamed from res/menu/contact_details.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/conversations.xml (renamed from res/menu/conversations.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/encryption_choices.xml (renamed from res/menu/encryption_choices.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/manageaccounts.xml (renamed from res/menu/manageaccounts.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/manageaccounts_context.xml (renamed from res/menu/manageaccounts_context.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/message_context.xml (renamed from res/menu/message_context.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details.xml (renamed from res/menu/muc_details.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/share_with.xml (renamed from res/menu/share_with.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation.xml (renamed from res/menu/start_conversation.xml) | 0 |
13 files changed, 0 insertions, 0 deletions
diff --git a/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index 20932489..20932489 100644 --- a/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml diff --git a/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index e39091b3..e39091b3 100644 --- a/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml diff --git a/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml index fd898580..fd898580 100644 --- a/res/menu/conference_context.xml +++ b/src/main/res/menu/conference_context.xml diff --git a/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 11ac7d7c..11ac7d7c 100644 --- a/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml diff --git a/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index 02f2e813..02f2e813 100644 --- a/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml diff --git a/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 3edee120..3edee120 100644 --- a/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml diff --git a/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index adf0ad8d..adf0ad8d 100644 --- a/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml diff --git a/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index b5cd9b50..b5cd9b50 100644 --- a/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml diff --git a/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml index 7a7cc0a2..7a7cc0a2 100644 --- a/res/menu/manageaccounts_context.xml +++ b/src/main/res/menu/manageaccounts_context.xml diff --git a/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 80d4d196..80d4d196 100644 --- a/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml diff --git a/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 97369098..97369098 100644 --- a/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml diff --git a/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index cbd15c11..cbd15c11 100644 --- a/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml diff --git a/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index f7230169..f7230169 100644 --- a/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml |