diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:30 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:30 +0100 |
| commit | dd224e5abf924e7e3927110a2a903bb496366d1e (patch) | |
| tree | 59717179ddcca694e014048b07fa3ca726615f16 /examples | |
| parent | e717dfbea17afb894c012438c1f59ca028709c9c (diff) | |
| parent | 2a484f4c3d23d8b9fdaa381696251736d5d3da10 (diff) | |
| download | qtactiveqt-dd224e5abf924e7e3927110a2a903bb496366d1e.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I9211d15553ae9b316784183a448bf1fbab1b07fc
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions