-
Eike Ziller authored
Conflicts: qtcreator.pri qtcreator.qbp src/libs/3rdparty/botan/botan.qbs src/libs/ssh/ssh.qbs src/plugins/qnx/blackberryqtversion.cpp Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
49d5c238
Conflicts: qtcreator.pri qtcreator.qbp src/libs/3rdparty/botan/botan.qbs src/libs/ssh/ssh.qbs src/plugins/qnx/blackberryqtversion.cpp Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9