src/plugins/debugger/debuggerplugin.cpp · 38e98e60d543d75dd9786e2bdac9dd27e027384b · Tobias Hunger / qt-creator

12 years ago

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1

45f8e241

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1