diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-27 08:06:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-27 08:06:41 +0200 |
| commit | 3c69ee0f05e7c96938c8b2fd70f122cbaf07232a (patch) | |
| tree | ac7b7629ac99702f4c67981c83aad36355c91c04 /.qmake.conf | |
| parent | 31a2cbbbc2dcf7d87a4b90c90c193e09e9676d6c (diff) | |
| parent | 018cd6d70f18762d20cc501ac352fa5f94eb7f66 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaf83f4c74b25b08764005267713db91c95732fc0
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions