diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:57 +0100 |
| commit | e369af5feaaa769aacc8513301300df47babfbc2 (patch) | |
| tree | 80f1314106f32fe6aaedcdc61799d8e6d55371bf /src | |
| parent | 1b8225028d3e18ed912f41944e7a60679e3a5142 (diff) | |
| parent | 030a9c9a0d00bf15ea632d956c9c84535774dfe7 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ibbb51f63638ab198ebeae20bcc6fc7378378e1c4
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions