aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:22:31 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:22:31 +0200
commit368b0bbf2b2854547cfafa7092361f09dd157fb1 (patch)
tree48b08c5912271c1ca9a4364a4dfdd984bb083653 /examples
parent80d6ea6cac5ece4e3053ec19810abceb77feb4da (diff)
parentd08a073fffabb1e8629145b1b2114314ef01dcff (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Diffstat (limited to 'examples')
-rw-r--r--examples/androidextras/notification/android-sources/res/drawable/icon.pngbin3953 -> 3264 bytes
-rw-r--r--examples/androidextras/notification/images/happy.pngbin2804 -> 1767 bytes
-rw-r--r--examples/androidextras/notification/images/sad.pngbin2447 -> 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
index e870213..035c600 100644
--- a/examples/androidextras/notification/android-sources/res/drawable/icon.png
+++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png
Binary files differ
diff --git a/examples/androidextras/notification/images/happy.png b/examples/androidextras/notification/images/happy.png
index d1c1460..fd31f8d 100644
--- a/examples/androidextras/notification/images/happy.png
+++ b/examples/androidextras/notification/images/happy.png
Binary files differ
diff --git a/examples/androidextras/notification/images/sad.png b/examples/androidextras/notification/images/sad.png
index 00026bd..74e8f8f 100644
--- a/examples/androidextras/notification/images/sad.png
+++ b/examples/androidextras/notification/images/sad.png
Binary files differ