diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:04:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:04:41 +0100 |
| commit | 5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1 (patch) | |
| tree | 7aa21cde3da0200a293ece5ca0cb1330f5513b3b /.qmake.conf | |
| parent | e5c93da50f3b05d312f0e3dec50baf9fcbd5ffdc (diff) | |
| parent | 26ea44e3b45de4a33515c826f6f5c9aa501f57fd (diff) | |
| download | qtserialport-5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I0dcaa0ea10fa9ca4a04f5c3837ea70028fc9c0b8
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions