diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:41:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:41:55 +0100 |
| commit | e4a72450c72fbc7751fd2a983e275f4fdfec81c3 (patch) | |
| tree | 166a5c8858f33e12057ae8f19ae3b4fb5650b66c /examples | |
| parent | 2353df997fee7ec6b99765762f21c925c33a53ab (diff) | |
| parent | 78cb91f7143ef1e768c6875475fda243094239b4 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ib0586881ba40d46dc3da5ee4ac93447afd119d01
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions