summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 21:04:33 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-18 21:05:12 +0100
commitaee027f581839caf44de1b176099ef2b22d2fc84 (patch)
tree47476bc0bacf514446d4863a3b92866eeaf54df3
parent1b425f4d5a91d9c354b9fa47a9cd61360110e3c7 (diff)
parent6f62e9de520a50a7bc90241d4a5d2c385a25373f (diff)
downloadqtserialport-aee027f581839caf44de1b176099ef2b22d2fc84.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts: .qmake.conf Change-Id: I7fd4397a06b77adb9ae6b4f3f47bf5f498725db6
0 files changed, 0 insertions, 0 deletions