diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:28:24 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:28:24 +0100 |
| commit | 0a23233f9c074e107a783b9522341259ce0e567e (patch) | |
| tree | 65ec2341f69c9c035b5f1b50d1135802c9463879 | |
| parent | 481c8b56afe566214503c45046cb83a2ca469207 (diff) | |
| parent | cb8ed9694b850a429a93490beaa6462d9f3b8ea6 (diff) | |
Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Id379003446bebe11e3d3fe7864d7b48e65bf1890
0 files changed, 0 insertions, 0 deletions