-
Oswald Buddenhagen authored
Conflicts: src/libs/utils/environment.cpp src/plugins/android/androidtoolchain.cpp src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp src/shared/proparser/qmakeevaluator.cpp Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
e730e2bb