diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:26:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:26:13 +0100 |
| commit | 4458f9376aa88b556e38d81180c5966889009bfb (patch) | |
| tree | 44b5b9921eb4f9cf5030317685544c4d20820935 /.qmake.conf | |
| parent | 23902340662f1ef6f5dafe68a34b593aed6ea497 (diff) | |
| parent | f640521532087dc76d36b25a6c49b2f64afcd4de (diff) | |
| download | qtserialport-4458f9376aa88b556e38d81180c5966889009bfb.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ie713faf0d6395f11477fceb35c93388756e33fae
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions