diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:39 +0100 |
| commit | 99cb7b0a4c7b7080216385b0940ee85a930f2cf5 (patch) | |
| tree | d2cbeeb1bf82487b4014f5cf39f3a1faa8d3a8ef | |
| parent | 1d664811805984e58cc44d4553c700d51389c389 (diff) | |
| parent | 2826fb63aa9936388950e90d8255b4b4579e6328 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie2e8dfe69bdfdb3c7badceb4e53f8c61616a4067
0 files changed, 0 insertions, 0 deletions