-
Oswald Buddenhagen authored
Conflicts: qtcreator.pri qtcreator.qbs tests/system/shared/project.py tests/system/suite_general/tst_create_proj_wizard/test.py Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
a4d714e2
Conflicts: qtcreator.pri qtcreator.qbs tests/system/shared/project.py tests/system/suite_general/tst_create_proj_wizard/test.py Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef