diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:12:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:12:00 +0100 |
| commit | c8109fdac1c66816bf72551b886f03f05a20da0e (patch) | |
| tree | 2d1ba945ef6b505763026f089a3c7c05c8a754f6 | |
| parent | cf82978ac02114a9e0ea164443c0bb396fc7db0f (diff) | |
| parent | aa69d43037f9dd612af400ff662e0004b1d4d9dd (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I34c07ac0a2c0c01501f0cd095542e266ef456607
0 files changed, 0 insertions, 0 deletions