diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:24 +0200 |
| commit | dd25428f5e8709b353a3dd81e33ab54cf82c059b (patch) | |
| tree | 1983a3db0211bff7480a39f3a19064e4018c2b18 | |
| parent | 4e73618f6b8e878454b3e432217ffd9735003fbb (diff) | |
| parent | 3b24bce1d7147e18a997e2792352e8213522230d (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ia2ad5d124b5ade98463e2304a96458d5d9fb9a59
0 files changed, 0 insertions, 0 deletions