diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-18 10:02:27 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-18 10:02:27 +0100 |
commit | 2528fce0a8d40772534cb03cd47e7db306327f15 (patch) | |
tree | 9f68b5db36d78177cd89d836cdadd4822e9d083f /.qmake.conf | |
parent | f97f339f0bebceb00c01cc92acdbe045506c81c8 (diff) | |
parent | ba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8 (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