diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:57 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:57 +0200 |
commit | 70e5fd51f7f7b94a189d201dbb4094e0602c0f84 (patch) | |
tree | ea0cbf1d641bdfce0bbbbb5638826229bb0cba61 /.qmake.conf | |
parent | 1cb060814cee73c7742e099388776cf90230e209 (diff) | |
parent | 92020773c1739feb4dc240827271720f615431d0 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia989ea1ad680f0457f1fe7dd044d0e36f2a30816
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions