Merge "Merge branch '1.1' into 'master'."
authorJoerg Bornemann <joerg.bornemann@digia.com>
Wed, 6 Nov 2013 11:33:55 +0000 (12:33 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 6 Nov 2013 11:33:55 +0000 (12:33 +0100)
commit131fcd07239222e528cddcdf43337a4aa093f771
tree05b7113883abb0284ba6338d3e189a03b78284fb
parent5778df9ad083767585d7b6154db7b34c3454664b
parent2d80d68db948bea027a6e0d9a9e289f112c5dd6e
Merge "Merge branch '1.1' into 'master'."
src/app/qbs/commandlinefrontend.cpp