diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-16 16:19:22 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-16 16:19:22 +0100 |
| commit | f900f38f710e434cc75fdb349b1c5c7e3b30cde4 (patch) | |
| tree | 4be3bef535eeef6cbc81097c05c28289cff9f118 /LICENSE.LGPLv21 | |
| parent | 122d4551b551c9991893dcad8734262fe6475b1c (diff) | |
| parent | be35b9f9af23a2b84ccab7e24b10e70d9324e42b (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtmacextras
qtmultimedia
qtquick1
qtscript
qtsensors
qtserialport
qtsvg
qttools
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0
Diffstat (limited to 'LICENSE.LGPLv21')
0 files changed, 0 insertions, 0 deletions