diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:02 +0100 |
| commit | b11ec513d9d9410dc46737005020479340cad9a2 (patch) | |
| tree | 612c25b785a6c160e40c6485feb0d2f2ff6b4c2f /LICENSE.FDL | |
| parent | 42932e1a9dfd6699763b336f552e46f9b1ff30c9 (diff) | |
| parent | 4e8e47989d96f8d60feec2187e4d9c85adb19c2a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Icf8b9f73c50b16d6f5765040eb7bd918231df94a
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions