diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:53 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:53 +0100 |
| commit | 14fcbc7c73cc0498b5614451be3720f2615b8a61 (patch) | |
| tree | 480a0866cc86ec6bc9a8ded22220a8a2eebc7619 | |
| parent | 0f38777d23b160902cb9b476098e0da6cd097068 (diff) | |
| parent | 4b0c33cb0673f984924fd16b945c123d55ccaa2f (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I28551c135bed2f106630ef0556d9efbf6a87c204
0 files changed, 0 insertions, 0 deletions