diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:04:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:04:34 +0200 |
| commit | 6630994af46d22503982d54c72a8fe5cd5e51be5 (patch) | |
| tree | fc29bfd23fca3dc782a011556763ac18e2f18e87 /src | |
| parent | 23c89518d1404a4db570fe41f3cc04451703e16f (diff) | |
| parent | ad108e9d56e7838eac3726e0492a246086d53e70 (diff) | |
| download | qtserialport-6630994af46d22503982d54c72a8fe5cd5e51be5.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/serialport/qserialport_win.cpp
src/serialport/qserialport_wince.cpp
Change-Id: I6933b53304cf842f452404c9fac487ec6191916d
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions