diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 19:26:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 19:26:48 +0100 |
| commit | ff18885e0a7f7527eb96a9f2047507e7f418db45 (patch) | |
| tree | 37bd1970c31447c73862b81eae4429c7366ef1c7 /.qmake.conf | |
| parent | 439f31f128e70ecae16544ee7041695c60e0b2d6 (diff) | |
| parent | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions