GitLab

Conflicts:
	kmail/editor/kmcomposewin.cpp
	ktimetracker/support/ktimetracker.desktop
	messagecomposer/attachment/attachmentcontrollerbase.cpp
	messagecomposer/attachment/attachmentcontrollerbase.h
	messagelist/pane.cpp
	messagelist/pane.h
	messageviewer/viewer/editorwatcher.cpp
	messageviewer/viewer/editorwatcher.h
	messageviewer/viewer/nodehelper.cpp
	messageviewer/viewer/viewer_p.cpp

Conflicts:
	kmail/kmcommands.cpp
	korganizer/previewdialog.cpp
	korganizer/previewdialog.h
	messagecore/attachment/attachmentfromurlbasejob.cpp
	messagecore/autotests/mailinglisttest.cpp
	messageviewer/viewer/editorwatcher.cpp
	messageviewer/viewer/editorwatcher.h
	messageviewer/viewer/mailsourceviewer.cpp

Conflicts:
	kmail/kmmainwidget.cpp
	korganizer/docprefs.cpp
	korganizer/docprefs.h
	korganizer/statusdialog.cpp
	korganizer/statusdialog.h
	pimcommon/texteditor/commonwidget/texteditfindbarbase.cpp
	pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp
	pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.h
	pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
	pimcommon/texteditor/richtexteditor/richtexteditorwidget.h

Conflicts:
	agents/archivemailagent/akonadi_archivemail_agent.notifyrc
	agents/notesagent/notesagent.desktop
	kaddressbook/printing/grantlee/themes/full/theme.desktop
	knotes/data/knotes.notifyrc
	knotes/print/themes/background-color/theme.desktop
	kontact/plugins/knotes/kcmknotessummary.desktop
	pimcommon/widgets/splittercollapser.h

REVIEW: 121015

Conflicts:
	kmail/autotests/overwritemodewidgettest.cpp
	kmail/autotests/overwritemodewidgettest.h
	kmail/editor/kmcomposewin.cpp
	kmail/tests/CMakeLists.txt
	kmail/tests/overwritemodewidgettest.h
	kmail/tests/statusbarlabeltoggledstatetest.h

Conflicts:
	agents/followupreminderagent/followupremindermanager.cpp
	agents/followupreminderagent/jobs/followupreminderjob.cpp
	kmail/autotests/followupreminderselectdatedialogtest.cpp
	kmail/editor/kmcomposewin.cpp
	kmail/followupreminder/followupremindercreatejob.h
	kmail/followupreminder/followupreminderselectdatedialog.cpp
	kmail/followupreminder/followupreminderselectdatedialog.h
	kmail/tests/CMakeLists.txt
	mailcommon/search/searchpattern.cpp
	messageviewer/scamdetection/scamdetectionwarningwidget.cpp

Conflicts:
	agents/followupreminderagent/jobs/followupreminderjob.cpp
	kmail/editor/kmcomposewin.cpp
	kmail/kmmainwin.cpp
	korganizer/exportwebdialog.cpp

Conflicts:
	examples/mailreader/mailreader.desktop
	kmail/configuredialog/configureaccountpage.cpp
	kmail/ui/accountspagereceivingtab.ui
	korganizer/CMakeLists.txt
	korganizer/koprefsdialog.cpp
	pimcommon/widgets/ui/manageaccountwidget.ui

Conflicts:
	korganizer/filtereditdialog.cpp

Conflicts:
	korganizer/filteredit_base.ui