summaryrefslogtreecommitdiff
path: root/qtserialport.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-06-03 10:59:23 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-06-03 10:59:23 +0200
commitab55707a73189ae35c422d77663b8b9d7b414c88 (patch)
tree70327e4eda8786b317f90578cebed19901e8a9e1 /qtserialport.pro
parent90ac0fffa223d8f81cf9a3c6a89cd4ec1de5f537 (diff)
parent71c38793265fc2966cde5ef64ef21c4bb122bd0f (diff)
downloadqtserialport-ab55707a73189ae35c422d77663b8b9d7b414c88.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I17cb5c718702e845fe7d93e66a84c5df915268c0
Diffstat (limited to 'qtserialport.pro')
0 files changed, 0 insertions, 0 deletions