diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:36:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:36:29 +0200 |
| commit | b925c6d82bdd0603edfa9ee160ed9aec704c7434 (patch) | |
| tree | 58cb29ae4145b7c4c80c8fcfba24b2a6642dfffd /.qmake.conf | |
| parent | 180f28916e072d7aff8ae02b7aa960ad61182ecd (diff) | |
| parent | 330bd7142dc4ef5682db971306441e7f8852af4e (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: I3b03e0033077bb90aba10e8c4ca4cd05cb81f6d3
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions