diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-05-24 09:02:32 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-05-24 09:02:32 +0300 |
| commit | 4d37184b10b69ef27048232377724533a4b5fac5 (patch) | |
| tree | 3bd3909b986270b76ceb2da4ad211969b1317436 /src/libs/installer/constants.h | |
| parent | 97498e486ac2d1d25206d4151613693dcf69e571 (diff) | |
| parent | d7d0974f9cdc2359b6b3ca0e359f2fe05ad437c4 (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: Ifaac76cd06737167a908baba5e554bedddd0e5ae
Diffstat (limited to 'src/libs/installer/constants.h')
0 files changed, 0 insertions, 0 deletions