diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 12:43:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 18:57:25 +0200 |
| commit | 10967b1443720116744ecfc42fe442681d149c5a (patch) | |
| tree | a58a4a21239f8a4f4aefbdd9685101c5f005c2be /tests | |
| parent | 7ef82ae562bab6b8bf7043d8e377eff60bb87b8a (diff) | |
| parent | 133dbd59fb04974149d2140b267fce91a7cfd4a2 (diff) | |
| download | qtserialport-10967b1443720116744ecfc42fe442681d149c5a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/serialport/qserialport_win.cpp
Change-Id: I8f3403d448ef2e51cf2870b331c61ab808393e34
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions