diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-12 14:26:47 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-12 14:28:25 +0200 |
| commit | f8eb954d797a5f571144c985eb3ac3dc7c2bc885 (patch) | |
| tree | 70591ae81dffd71d9b14d11d66ce7c12b9cb8bb4 /.qmake.conf | |
| parent | 21b73aea69a45e2f7bcbdf1b10e9908ae6bd9559 (diff) | |
| parent | 1ccb59ae5d57a854e8912dc21baf487cf7828432 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
* origin/5.6:
Remove wildcard in enterprise-gallery demo .pro file
Change-Id: I64fe114bcb616f792bd02625cdf11ecdf6f9c093
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions