diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-01 17:16:04 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-01 17:16:04 +0000 |
commit | 23ea3f7a3359b0cd28bc0b38512f2764d19367c3 (patch) | |
tree | 480bc835fc80d3029de9f308580bdcbcf572f287 /.qmake.conf | |
parent | b23a0dc60f72ad02475a234deb7137f7ab170d14 (diff) | |
parent | 911b72e7591e364cc8d17a30f6b54bcf0f20031c (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