diff options
| author | lookshe <github@lookshe.org> | 2016-02-22 14:36:35 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-22 14:36:35 +0100 |
| commit | c5e60b43b8e107702445e834bce8a3c77f676eb8 (patch) | |
| tree | 266138fdf20f29f7ed8a31d4682f02cd7012cf0e /src/main/res/drawable-xxhdpi | |
| parent | 1e40764b20a08170f8e4bfe1f1ae1559111f2961 (diff) | |
| parent | c20d8ac69eeade4d5337d958ada7910db0c6d3a0 (diff) | |
Merge tag '1.10.0' into trz/merge_1.10.0
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/layout/activity_edit_account.xml
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-gl/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nb-rNO/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values-zh-rTW/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png | bin | 0 -> 559 bytes |
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png | bin | 0 -> 558 bytes |
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png | bin | 0 -> 336 bytes |
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png | bin | 0 -> 436 bytes |
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_secure_indicator.png | bin | 380 -> 0 bytes |
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png | bin | 441 -> 0 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png Binary files differnew file mode 100644 index 00000000..dbcf3f33 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png Binary files differnew file mode 100644 index 00000000..895aabbf --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png Binary files differnew file mode 100644 index 00000000..66d25296 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png Binary files differnew file mode 100644 index 00000000..9d7f2ff9 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png Binary files differdeleted file mode 100644 index 6a74ccbe..00000000 --- a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png Binary files differdeleted file mode 100644 index 4945c959..00000000 --- a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png +++ /dev/null |
