diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:31:38 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:31:38 +0200 |
| commit | e16121e919ed3d35ec42480875553d0f533b028d (patch) | |
| tree | 3659b55ecb74d7c17c1ed69b886b1bac17655c8e | |
| parent | c37107219f9e4adde9e463083e188830c0e911a8 (diff) | |
| parent | 4e021d60f9e7493c071e02d45087de0804e2949f (diff) | |
| download | qttranslations-e16121e919ed3d35ec42480875553d0f533b028d.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I654e071118dc596304d9ac7039098a2970a93bed
0 files changed, 0 insertions, 0 deletions