summaryrefslogtreecommitdiff
path: root/qtserialport.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-15 03:00:28 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-15 03:00:28 +0200
commit65bd71f3cb14c31bd4e11e0bc0f08171f2a3e788 (patch)
tree54d38ddb23baf02a76df8d791e52d4048eec69bd /qtserialport.pro
parentd4b48a8ef81b7a3912ccee387ceb976d67a8b870 (diff)
parentc5ffb2ab8f546c8d7c3e88760c2666d6d185ced0 (diff)
downloadqtserialport-65bd71f3cb14c31bd4e11e0bc0f08171f2a3e788.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I100851112abbdfe4713a55cdd0ca345db95dcabf
Diffstat (limited to 'qtserialport.pro')
0 files changed, 0 insertions, 0 deletions