diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 08:52:49 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 09:02:33 +0300 |
commit | 7e91db5b1e01ffeeaa566ebb5b8230dcdc6b514f (patch) | |
tree | 61c14c9b0a44d66fd60096ac82dbf0ac930af4c5 /dist/packages | |
parent | cd063bc1bd2765080127045b4601f0082f413d6d (diff) | |
parent | bc84731cd487d9b77ebda247cc3e8487cc22af99 (diff) |
Merge remote-tracking branch 'origin/2.0' into 3.0
Conflicts:
src/libs/installer/downloadfiletask.cpp
Change-Id: Ie4b07c402a63c7a12ecf24e52e197507bbb2c5df
Diffstat (limited to 'dist/packages')
0 files changed, 0 insertions, 0 deletions