src/plugins/texteditor/basetexteditor.cpp · 43203140461174071f7a3e68bf388a6522556810 · Tobias Hunger / qt-creator

"README.md" did not exist on "c7e8b51d37700499536e3ab333190abd127ea0f7"

15 years ago

43203140

Merge branch 'origin/1.3' (early part) · 43203140

Oswald Buddenhagen authored 15 years ago

Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp

43203140

History

Merge branch 'origin/1.3' (early part)

Oswald Buddenhagen authored 15 years ago

Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp