diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 08:05:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 08:05:29 +0100 |
| commit | 9a70ee2389d3302f6a4262325f8a76e4d867b478 (patch) | |
| tree | 9b39f4db27d260bb32242e24630c414fcf1f582a /examples/serialport/cenumerator/cenumerator.pro | |
| parent | a2467f9ec2d09d6d665d169e0fb450169f921b12 (diff) | |
| parent | 03d492e49e74eefa1c83e37e833d862f4b9f1e45 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
src/serialport/qserialportinfo_osx.cpp
src/serialport/qserialportinfo_unix.cpp
src/serialport/qserialportinfo_win.cpp
src/serialport/qserialportinfo_wince.cpp
Change-Id: I9540cf8c714a99b7ace9aeaeb003cb4a00b8303e
Diffstat (limited to 'examples/serialport/cenumerator/cenumerator.pro')
0 files changed, 0 insertions, 0 deletions