diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:06 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:06 +0100 |
commit | 7e9b0f8e55cbdfc780a28b054ac2ad66a630e312 (patch) | |
tree | 2cbf9d330d7d86df65205aa48fbac9dcd62c5383 /.qmake.conf | |
parent | 2b5ea944b1d2f717dd74f6524cd0adc9077425de (diff) | |
parent | 190fd107ebf489783d9b673b97598da8febd48cc (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions