diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:07:18 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:07:19 +0200 |
commit | 36d65d7a6549c1aa6ed1ee8da675452f0b7e7cd4 (patch) | |
tree | 5126fe71cc90362855bae211471c23e4a63932e1 /examples/knx/device/mainwindow.cpp | |
parent | 258680ef7adb3364eaf394554506355634120181 (diff) | |
parent | 57ee5205e91d52d40ccc15bb290d07533e761342 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7325d45ee50247f4df317748811070f982d25392
Diffstat (limited to 'examples/knx/device/mainwindow.cpp')
0 files changed, 0 insertions, 0 deletions