diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:40:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:40:37 +0100 |
| commit | 0ed771f5045729052cef906475395dc8ced3fc8a (patch) | |
| tree | 9ee8a4c8eac36844224398902c85a4554fc23b00 /.qmake.conf | |
| parent | 4ca89439b36ba9761879c505072f6bf439da3b5b (diff) | |
| parent | 544d3e4f6f42771b38cafd8a200b16299f2d102c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I65259cbbae3074335478f54dc0ed5cb099fd8569
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions