diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:54:24 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:54:24 +0100 |
commit | 8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8 (patch) | |
tree | b6c8c56cab52241d2428a0aeceda7061ac1cd337 | |
parent | cd3d1278f012b8f6b259305fd06006be7f825c99 (diff) | |
parent | eee494c12a70fa0aa6fce427f47f44ff60281dca (diff) |
Conflicts:
.qmake.conf
Change-Id: I967987aa49ae367010b2fa1247f79827c6eb911c
0 files changed, 0 insertions, 0 deletions