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