diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:32:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:32:19 +0200 |
| commit | ff308676cc07f31201a4b0f8d8e06b73f41508c4 (patch) | |
| tree | 0bc4d4715b83f11cf4845e38e3074a6e039f9ffd | |
| parent | 27abf796987c137d2660efd8e73b0e0fc8ffad0c (diff) | |
| parent | 90448d592bb8b38ac544e868c6e5db9bf37168d8 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Id031d60ca79d8c90063c1d12903e75a418f47290
0 files changed, 0 insertions, 0 deletions