-
Eike Ziller authored
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
Eike Ziller authoredConflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e