diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:31 +0200 |
commit | 368b0bbf2b2854547cfafa7092361f09dd157fb1 (patch) | |
tree | 48b08c5912271c1ca9a4364a4dfdd984bb083653 /examples | |
parent | 80d6ea6cac5ece4e3053ec19810abceb77feb4da (diff) | |
parent | d08a073fffabb1e8629145b1b2114314ef01dcff (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875
Diffstat (limited to 'examples')
-rw-r--r-- | examples/androidextras/notification/android-sources/res/drawable/icon.png | bin | 3953 -> 3264 bytes |
-rw-r--r-- | examples/androidextras/notification/images/happy.png | bin | 2804 -> 1767 bytes |
-rw-r--r-- | examples/androidextras/notification/images/sad.png | bin | 2447 -> 1262 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png Binary files differindex e870213..035c600 100644 --- a/examples/androidextras/notification/android-sources/res/drawable/icon.png +++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png diff --git a/examples/androidextras/notification/images/happy.png b/examples/androidextras/notification/images/happy.png Binary files differindex d1c1460..fd31f8d 100644 --- a/examples/androidextras/notification/images/happy.png +++ b/examples/androidextras/notification/images/happy.png diff --git a/examples/androidextras/notification/images/sad.png b/examples/androidextras/notification/images/sad.png Binary files differindex 00026bd..74e8f8f 100644 --- a/examples/androidextras/notification/images/sad.png +++ b/examples/androidextras/notification/images/sad.png |