Commits
Tim Jenssen committed 72dfa6df1eeM
Merge remote-tracking branch 'origin/1.4' Conflicts: installerfw.pri tools/binarycreator/binarycreator.cpp tools/common/repositorygen.cpp tools/common/repositorygen.h tools/repogen/repogen.cpp Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947
