diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-19 13:08:14 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-19 13:08:14 +0100 |
| commit | 21a91b0ee1e7bde013cba1e4ce333dfeb238877d (patch) | |
| tree | 21394f812adcf52f9d2d2f8a039899fa418b78d5 /.qmake.conf | |
| parent | f7d858c49a6d535d4c62a7e976d7daeac58a7a8c (diff) | |
| parent | c924a94fb5077028965e2c6343e1bafabc0e69f8 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id375217229c7f7dc7a8a2dc7edcfd56bbe403952
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions