diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-20 15:59:43 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-20 15:59:50 +0200 |
| commit | d3804691474af33a5343773f20727ae47b45dfe8 (patch) | |
| tree | 44ca105215ea9d32597f06faa9fb5191b60f541c | |
| parent | 4a56c235e1bd12071e58d36113fccb270ee98a5e (diff) | |
| parent | 6c0d77396f8fa366b5e4b7e4fe90ccd3110d5258 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
src/3rdparty
Change-Id: I76d1c39c93cd45786cf95f9f010e7cee118f8887
0 files changed, 0 insertions, 0 deletions