diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-08-21 13:33:46 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-08-21 14:44:35 +0300 |
| commit | 1fe36e54d5bd75bc0a403218966f8046a66718da (patch) | |
| tree | 3153e54f94d2c0aaecfe0a60dc651c1da8f473fc /installerfw.pri | |
| parent | ad00a64d86be127e61016e02c78795c98a8c7982 (diff) | |
| parent | 776c09b3307463fb3c3d8da7054439a28c2c9ad0 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ib2ab53321b599eb2e8b1e6e23be2ba507a948c5c
Diffstat (limited to 'installerfw.pri')
0 files changed, 0 insertions, 0 deletions