diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:41:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:41:49 +0200 |
| commit | 0f3bdecc871625fe9873f1ba9d55aabad0036168 (patch) | |
| tree | 97dcdcc7173f020fa2deea25de1c42ee18ccec64 /examples | |
| parent | 4c5c0bc76b6f911b20a6ea53a143534e04412af6 (diff) | |
| parent | 335f1d02dc134bf11277c0573553c7c838cc6a9f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I0f003a4aef121836be3ed7f1b82e23321fdfe884
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions