diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:45 +0200 |
| commit | 40e7e42e7052063ea14653bb68878c4e55254947 (patch) | |
| tree | 8af506ae20fc51c62fdc9bbaa3fd3172ebfafaaf /.qmake.conf | |
| parent | 2f11ad4f6230cdb06699587d32b6744626ba62b1 (diff) | |
| parent | d15ee516e5a67823cd44b1cbdc490ad175eb29b4 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: Ia81a38826351ffed9409c6ddd24fb4b8beda4d10
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions