diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:48 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 19:58:11 +0100 |
commit | ac32e1ed4c5f83dfbef3ee5ac8b8c37852269f85 (patch) | |
tree | 797d3dfaa4c1bdcfbfb173dfb8cdf4095b6ac0fe /examples/winextras/musicplayer/images/musicplayer.ico | |
parent | 13604e3fcc12a536d228f415ce65ca1c86b7015b (diff) | |
parent | 894011181bc18c4d5190424f874d839e2343d387 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/winextras/musicplayer/main.cpp
Change-Id: I3838d6c802e4e95d4f8985f61d8b24692b2ec916
Diffstat (limited to 'examples/winextras/musicplayer/images/musicplayer.ico')
-rw-r--r-- | examples/winextras/musicplayer/images/musicplayer.ico | bin | 31371 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/winextras/musicplayer/images/musicplayer.ico b/examples/winextras/musicplayer/images/musicplayer.ico Binary files differdeleted file mode 100644 index fef1dee..0000000 --- a/examples/winextras/musicplayer/images/musicplayer.ico +++ /dev/null |