diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:31:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:31:51 +0200 |
| commit | 82902577ba17baef3cce72e5570ba8dedd602dca (patch) | |
| tree | 63210e0e62c19189bb64e42941b0a48f41a4b13a | |
| parent | c4435020ce5f40bc82715f6fc8f75740e229b6fb (diff) | |
| parent | 129ac03ff99fa6910dc81650ecb107b303a5c199 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-beta1
Conflicts:
.qmake.conf
Change-Id: I96c28eff39225f312a37be76d31054a81fc3fa41
0 files changed, 0 insertions, 0 deletions