diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:40 +0200 |
| commit | 62b718af9fb8efe9dca152b8be22963ffa963f3c (patch) | |
| tree | 76f201189eb5ec8f16755b0ed566564df988e90f /.qmake.conf | |
| parent | 31b107298609928c0eaa2e974ade59ce9d815e2c (diff) | |
| parent | 24fb923ef697d91618e15ee0c66dd5b0d0a22579 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions