diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:22:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:22:32 +0200 |
| commit | e0e5a57430af761192b98292fab73284d351e4f1 (patch) | |
| tree | 4a6663c15c8efa8ce3d37b9c8d76aee7010e5852 /.qmake.conf | |
| parent | c7685c3a37c0ff8bbd49088dea63e8cdcae459ca (diff) | |
| parent | f3d6e8eed740aff58891827e0061d213a7e512cb (diff) | |
Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ida2f3c978e30f117a6e517aec1c28a5cf1e08ed6
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions