diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-01 10:40:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-01 10:40:16 +0200 |
commit | 409a879f3617a7db7f3abfb3408f2530c139b24b (patch) | |
tree | 9238b92b5385139b6c037b45b080329d6f549cb5 /.qmake.conf | |
parent | 5c99313eedada4e502b57798122ab20d71eca0fe (diff) | |
parent | 2e4acacfa3a062b8585226500f6cbc65597b8b67 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ic4220f9957266c374f751d3612c60b81e9cea193
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions