diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /art | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'art')
| -rwxr-xr-x | art/render.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/art/render.rb b/art/render.rb index 386366a4..2ab3e94f 100755 --- a/art/render.rb +++ b/art/render.rb @@ -4,6 +4,7 @@ resolutions={ 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3, + 'xxxhdpi' => 4, } images = { 'conversations_baloon.svg' => ['ic_launcher', 48], |