diff options
| author | aavit <eirik.aavitsland@digia.com> | 2014-11-14 15:01:55 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@digia.com> | 2014-11-14 15:25:43 +0100 |
| commit | 7c5126a80c95f262ff3c480604b57532d9ed9079 (patch) | |
| tree | 053fba4f2f3ccd2b231b310ab49b9db39491d095 /.qmake.conf | |
| parent | 1f0de42b9d5a8ef665e6799019eed898b0396586 (diff) | |
| parent | 9b2dd9f64bdd5c2349407ae8517ae974eda97885 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib0a08de8aaf17f2803d51bded8d0dcfb14e9c206
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions