diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:07 +0200 |
| commit | 6e42e0c0191f4a5d1746bb55939c7e00be580f6d (patch) | |
| tree | 7cafad4737c0b9fcc8e0a27558cffbf817ed5e89 | |
| parent | 2ff1437ac1b1e9d8f385679d66b64c93be6c2a00 (diff) | |
| parent | ca99f8c3365a595d9947ab9d6158107f0747c9b6 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I29cb249c95dfed1e8d3f356d52bfe7c73c13c786
0 files changed, 0 insertions, 0 deletions