Conflicts:
	plugins/classbrowser/kdevclassbrowser.desktop.cmake
	plugins/codeutils/kdevcodeutils.desktop.cmake
	plugins/git/gitplugin.cpp
	plugins/git/gitplugin.h
	plugins/grepview/kdevgrepview.desktop.cmake
	plugins/patchreview/patchreview.cpp
	plugins/projectmanagerview/vcsoverlayproxymodel.cpp
	plugins/reviewboard/reviewboardjobs.cpp
	vcs/vcsdiff.cpp
	vcs/vcsdiff.h
	vcs/widgets/vcsdiffpatchsources.cpp