diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:07 +0100 |
| commit | dc1b01aed6191f9977e28e3763cdd2c4cb88d22b (patch) | |
| tree | 651cb09c5268a795058b1570d0fe2eb2f73d55b2 | |
| parent | 59354c50b52131987d5716f3254ddd2b5b2b4865 (diff) | |
| parent | 015d6117f30891fe01f57c4b5d3b3a4695c41074 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6
0 files changed, 0 insertions, 0 deletions