diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
commit | b78db8c1e4ec16ef8dff1585d14f9375551c47df (patch) | |
tree | f62668cea56b9a314224ab5167bc68d725960099 /.qmake.conf | |
parent | 2570b801c74832a3c83a8b56ad0f76812969e190 (diff) | |
parent | b64a1b3078a764797cbc3e1e4a456257c32721d6 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I37bc7afea415261639b71e7b8dfc9177fdd4cb62
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions