diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:25 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:25 +0200 |
| commit | c62647e11f551ce35e2ed04c87c211622a23c6b9 (patch) | |
| tree | 6a72d6e97d0f32b976485ee6bba3921cf4730741 | |
| parent | 052cd46bd5de5d86f97d12301f088c89a1eda790 (diff) | |
| parent | f35a59a6d8b979710d1aab993643b2a766495a2d (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-beta1
Conflicts:
.qmake.conf
Change-Id: Icabe869a513a8784db00fd388332d723f5379cc1
0 files changed, 0 insertions, 0 deletions