src/plugins/texteditor/basetexteditor.cpp · 20eeca15ce4014480f39c70db7d848cd99fad7c8 · Tobias Hunger / qt-creator

14 years ago

Thorbjørn Lindeijer authored 14 years ago

Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp

173cdff5

Thorbjørn Lindeijer authored 14 years ago

Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp