diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:25 +0200 |
| commit | 643447cca3703f3473e0d21bf18e20fa382bc07a (patch) | |
| tree | b939d28cd018ec74b710c512fae7ddf5ab2cece4 /src/src.pro | |
| parent | e3e54002f113f32c038dae8cc3341572902de49b (diff) | |
| parent | 30b0e73404e7638fdf802990e81b98143f45c34f (diff) | |
| download | qtx11extras-643447cca3703f3473e0d21bf18e20fa382bc07a.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I4752ddb590f0389bda606dfd7478cf9d26b2199c
Diffstat (limited to 'src/src.pro')
0 files changed, 0 insertions, 0 deletions