diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:11 +0200 |
| commit | 30b0e73404e7638fdf802990e81b98143f45c34f (patch) | |
| tree | 950405246b1045b36fa648b903d3a56dc79711f8 /tests | |
| parent | 3c834c9ce2a6c60a16b13861fb7383b048557e58 (diff) | |
| parent | df10edcfae328f397c99192b322268c9e96f6dab (diff) | |
| download | qtx11extras-30b0e73404e7638fdf802990e81b98143f45c34f.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ie176f84f2ff0160efa4e39491e6a86d5a8d84f20
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions