diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:29:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:29:29 +0100 |
| commit | 15c618da80a71d0f5c33cdade6535f43eb852363 (patch) | |
| tree | 1b5e34607283991c19e6548a46889efa591902b8 /examples/serialbus/modbus/master/master.pro | |
| parent | b0009399980d51e157e46c745a710bc1cd6706c1 (diff) | |
| parent | 3ff518d2d05ce7eba511cc36509964f205470a93 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I272b8caf0eb4398c66871e68a9d89bd7ec493c3a
Diffstat (limited to 'examples/serialbus/modbus/master/master.pro')
0 files changed, 0 insertions, 0 deletions