diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-23 16:22:32 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-23 16:25:06 +0000 |
| commit | f0ca96308b23643df1208acfe72015b46ae70067 (patch) | |
| tree | 265bc747a3b5383075ecb12d99c3c89dcd5a2274 /res | |
| parent | 89ee9588459755193dfff3df45f4494d53b25854 (diff) | |
| parent | f129a9b52110ffafec4400e17d78881c50307d8a (diff) | |
| download | connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.gz connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.bz2 connectbot-f0ca96308b23643df1208acfe72015b46ae70067.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/src/main/java/org/connectbot/HostListActivity.java
app/src/main/java/org/connectbot/service/TerminalKeyListener.java
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-xhdpi/notification_icon.png | bin | 0 -> 380 bytes |
| -rw-r--r-- | res/drawable-xxhdpi/notification_icon.png | bin | 0 -> 568 bytes |
| -rw-r--r-- | res/drawable-xxxhdpi/notification_icon.png | bin | 0 -> 665 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xhdpi/notification_icon.png b/res/drawable-xhdpi/notification_icon.png Binary files differnew file mode 100644 index 0000000..3b79360 --- /dev/null +++ b/res/drawable-xhdpi/notification_icon.png diff --git a/res/drawable-xxhdpi/notification_icon.png b/res/drawable-xxhdpi/notification_icon.png Binary files differnew file mode 100644 index 0000000..0d8b9e1 --- /dev/null +++ b/res/drawable-xxhdpi/notification_icon.png diff --git a/res/drawable-xxxhdpi/notification_icon.png b/res/drawable-xxxhdpi/notification_icon.png Binary files differnew file mode 100644 index 0000000..2bafbb9 --- /dev/null +++ b/res/drawable-xxxhdpi/notification_icon.png |
