diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 08:36:01 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-06 08:36:01 +0000 |
commit | fc37a3964db412d110e7513534b6178e154044c4 (patch) | |
tree | 911d1fa23aa8edc4d77a2b2655d3653b56338728 /.qmake.conf | |
parent | f52737f60e505101d2364cd6f3713ea8303f30f0 (diff) | |
parent | 092842b5e00662ae9888a19326a9fe4cf140f4da (diff) |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions