diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:13 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:13 +0100 |
commit | 16a0d2cf8f9bd6762b4382a698c9bf712138ae6b (patch) | |
tree | 64d3e15300b4bd88d7d0c4109ca9c7cef3ca3b02 /src/serialport/qserialportglobal.h | |
parent | f9169594ce8e80fd12994ea7718a040a24a896d4 (diff) | |
parent | 6dda140ada3d7c683537b069bf1512275a190884 (diff) | |
download | qtserialport-16a0d2cf8f9bd6762b4382a698c9bf712138ae6b.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Idc590cb4d891d7701cc443be80275c4d9ccfa5a6
Diffstat (limited to 'src/serialport/qserialportglobal.h')
0 files changed, 0 insertions, 0 deletions