diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-04 15:12:48 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-04 15:12:48 +0200 |
| commit | f50f43bf1b8aa0487bf5856ec7fcc4d1112239b2 (patch) | |
| tree | c883dc34172072e184a49957f7e17d3709f40143 | |
| parent | 4fbef973df2812be48f64cb9829f94fba240a73c (diff) | |
| parent | aa00047183008edd739df472cf0490e9fffbe655 (diff) | |
Merge branch '5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I50d35abb0377dcdb645faa46d458c12934cf3514
0 files changed, 0 insertions, 0 deletions