diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:36:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 22:53:29 +0200 |
| commit | 85f9ac4a202117cb4dc506cd0696abafe23fb4f1 (patch) | |
| tree | 13faa78c49b4ba8436e45af07cee3d126301a55a /.qmake.conf | |
| parent | 9213d031980d32f25468eeb9177d6f403060bf00 (diff) | |
| parent | fb0b6399afdd39ab2240801c839c06ea70a22c4b (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