-
Eike Ziller authored
Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
e5e3f91e
Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d