diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:21 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:21 +0100 |
| commit | c092e7b01c7398fb1ec7af3e44e28cc21a809e9e (patch) | |
| tree | a628a2a86b0297665d52a627f8cfb7472e75d843 | |
| parent | cd38504c03cd5c9efef381eeafafb32da38b817c (diff) | |
| parent | 0931e0f2819fa9a6adca078140d86dafda53bb10 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I7c0878aff49109058a4fa28fde2e146c4fdbc9b3
0 files changed, 0 insertions, 0 deletions