diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:27 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:27 +0100 |
| commit | 08a64a9a81b9b1366b0085a413cd9fc2fd0e3370 (patch) | |
| tree | 20019ac64b4c23e1183681d7ce8d4d150f4b5c5e /LICENSE.GPLv2 | |
| parent | dc1b01aed6191f9977e28e3763cdd2c4cb88d22b (diff) | |
| parent | 2c08111f5450876e37730515fce4683da91be35c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I72c06814a05ac09cb498d4af89dc9e7d791e6cce
Diffstat (limited to 'LICENSE.GPLv2')
0 files changed, 0 insertions, 0 deletions