diff options
author | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
commit | 89b28a496542b1995f60efb6b8937d11adf8e425 (patch) | |
tree | 2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /libs/emojicon/src/main/res | |
parent | a76de90fe7a53220e9358d38fa7b47b63f7694fe (diff) | |
parent | 0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff) |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to '')
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_angel.png (renamed from src/main/res/drawable/emo_im_angel.png) | bin | 3592 -> 3592 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_cool.png (renamed from src/main/res/drawable/emo_im_cool.png) | bin | 3466 -> 3466 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_crying.png (renamed from src/main/res/drawable/emo_im_crying.png) | bin | 3558 -> 3558 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png (renamed from src/main/res/drawable/emo_im_embarrassed.png) | bin | 3619 -> 3619 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_foot_in_mouth.png (renamed from src/main/res/drawable/emo_im_foot_in_mouth.png) | bin | 3603 -> 3603 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_happy.png (renamed from src/main/res/drawable/emo_im_happy.png) | bin | 3591 -> 3591 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_heart.png (renamed from src/main/res/drawable/emo_im_heart.png) | bin | 684 -> 684 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_kissing.png (renamed from src/main/res/drawable/emo_im_kissing.png) | bin | 3492 -> 3492 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_laughing.png (renamed from src/main/res/drawable/emo_im_laughing.png) | bin | 3624 -> 3624 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_lips_are_sealed.png (renamed from src/main/res/drawable/emo_im_lips_are_sealed.png) | bin | 3670 -> 3670 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_money_mouth.png (renamed from src/main/res/drawable/emo_im_money_mouth.png) | bin | 3649 -> 3649 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_sad.png (renamed from src/main/res/drawable/emo_im_sad.png) | bin | 3572 -> 3572 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_surprised.png (renamed from src/main/res/drawable/emo_im_surprised.png) | bin | 3490 -> 3490 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_tongue_sticking_out.png (renamed from src/main/res/drawable/emo_im_tongue_sticking_out.png) | bin | 3653 -> 3653 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_undecided.png (renamed from src/main/res/drawable/emo_im_undecided.png) | bin | 3552 -> 3552 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_winking.png (renamed from src/main/res/drawable/emo_im_winking.png) | bin | 3568 -> 3568 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_wtf.png (renamed from src/main/res/drawable/emo_im_wtf.png) | bin | 3591 -> 3591 bytes |
-rw-r--r-- | libs/emojicon/src/main/res/drawable/emo_im_yelling.png (renamed from src/main/res/drawable/emo_im_yelling.png) | bin | 3575 -> 3575 bytes |
18 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable/emo_im_angel.png b/libs/emojicon/src/main/res/drawable/emo_im_angel.png Binary files differindex c34dfa69..c34dfa69 100644 --- a/src/main/res/drawable/emo_im_angel.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_angel.png diff --git a/src/main/res/drawable/emo_im_cool.png b/libs/emojicon/src/main/res/drawable/emo_im_cool.png Binary files differindex d8eeb34e..d8eeb34e 100644 --- a/src/main/res/drawable/emo_im_cool.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_cool.png diff --git a/src/main/res/drawable/emo_im_crying.png b/libs/emojicon/src/main/res/drawable/emo_im_crying.png Binary files differindex 1cafdb32..1cafdb32 100644 --- a/src/main/res/drawable/emo_im_crying.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_crying.png diff --git a/src/main/res/drawable/emo_im_embarrassed.png b/libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png Binary files differindex e4db9634..e4db9634 100644 --- a/src/main/res/drawable/emo_im_embarrassed.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_embarrassed.png diff --git a/src/main/res/drawable/emo_im_foot_in_mouth.png b/libs/emojicon/src/main/res/drawable/emo_im_foot_in_mouth.png Binary files differindex 09d1fba6..09d1fba6 100644 --- a/src/main/res/drawable/emo_im_foot_in_mouth.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_foot_in_mouth.png diff --git a/src/main/res/drawable/emo_im_happy.png b/libs/emojicon/src/main/res/drawable/emo_im_happy.png Binary files differindex b86602ae..b86602ae 100644 --- a/src/main/res/drawable/emo_im_happy.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_happy.png diff --git a/src/main/res/drawable/emo_im_heart.png b/libs/emojicon/src/main/res/drawable/emo_im_heart.png Binary files differindex d88bcccd..d88bcccd 100644 --- a/src/main/res/drawable/emo_im_heart.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_heart.png diff --git a/src/main/res/drawable/emo_im_kissing.png b/libs/emojicon/src/main/res/drawable/emo_im_kissing.png Binary files differindex 56378f6a..56378f6a 100644 --- a/src/main/res/drawable/emo_im_kissing.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_kissing.png diff --git a/src/main/res/drawable/emo_im_laughing.png b/libs/emojicon/src/main/res/drawable/emo_im_laughing.png Binary files differindex 980bf281..980bf281 100644 --- a/src/main/res/drawable/emo_im_laughing.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_laughing.png diff --git a/src/main/res/drawable/emo_im_lips_are_sealed.png b/libs/emojicon/src/main/res/drawable/emo_im_lips_are_sealed.png Binary files differindex f2de993b..f2de993b 100644 --- a/src/main/res/drawable/emo_im_lips_are_sealed.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_lips_are_sealed.png diff --git a/src/main/res/drawable/emo_im_money_mouth.png b/libs/emojicon/src/main/res/drawable/emo_im_money_mouth.png Binary files differindex 08c53fd6..08c53fd6 100644 --- a/src/main/res/drawable/emo_im_money_mouth.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_money_mouth.png diff --git a/src/main/res/drawable/emo_im_sad.png b/libs/emojicon/src/main/res/drawable/emo_im_sad.png Binary files differindex 31c08d06..31c08d06 100644 --- a/src/main/res/drawable/emo_im_sad.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_sad.png diff --git a/src/main/res/drawable/emo_im_surprised.png b/libs/emojicon/src/main/res/drawable/emo_im_surprised.png Binary files differindex abe8c7ad..abe8c7ad 100644 --- a/src/main/res/drawable/emo_im_surprised.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_surprised.png diff --git a/src/main/res/drawable/emo_im_tongue_sticking_out.png b/libs/emojicon/src/main/res/drawable/emo_im_tongue_sticking_out.png Binary files differindex 6f0f47b0..6f0f47b0 100644 --- a/src/main/res/drawable/emo_im_tongue_sticking_out.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_tongue_sticking_out.png diff --git a/src/main/res/drawable/emo_im_undecided.png b/libs/emojicon/src/main/res/drawable/emo_im_undecided.png Binary files differindex eb4f8c5b..eb4f8c5b 100644 --- a/src/main/res/drawable/emo_im_undecided.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_undecided.png diff --git a/src/main/res/drawable/emo_im_winking.png b/libs/emojicon/src/main/res/drawable/emo_im_winking.png Binary files differindex 568562ad..568562ad 100644 --- a/src/main/res/drawable/emo_im_winking.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_winking.png diff --git a/src/main/res/drawable/emo_im_wtf.png b/libs/emojicon/src/main/res/drawable/emo_im_wtf.png Binary files differindex 41dd47fc..41dd47fc 100644 --- a/src/main/res/drawable/emo_im_wtf.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_wtf.png diff --git a/src/main/res/drawable/emo_im_yelling.png b/libs/emojicon/src/main/res/drawable/emo_im_yelling.png Binary files differindex c3c8612b..c3c8612b 100644 --- a/src/main/res/drawable/emo_im_yelling.png +++ b/libs/emojicon/src/main/res/drawable/emo_im_yelling.png |