src/plugins/debugger/gdb/classicgdbengine.cpp · 65c169c80ee14d98a220c5d665f8e86b2630ec71 · Marco Bubke / flatpak-qt-creator

12 years ago

Merge remote-tracking branch 'origin/2.6' · 65c169c8

Oswald Buddenhagen authored 12 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6

65c169c8

History

Merge remote-tracking branch 'origin/2.6'

Oswald Buddenhagen authored 12 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6