GitLab

Conflicts:
	kjots/kjotsedit.cpp
	messagelist/autotests/quicksearchwarningtest.cpp
	noteshared/CMakeLists.txt
	noteshared/editor/noteeditorutils.cpp
	noteshared/editor/noteeditorutils.h

Conflicts:
	kaddressbook/utils.cpp
	knotes/dialog/knotedeleteselectednotesdialog.cpp

Conflicts:
	incidenceeditor-ng/visualfreebusywidget.cpp
	kmail/editor/kmcomposewin.cpp
	kmail/editor/kmcomposewin.h
	kmail/identity/xfaceconfigurator.cpp
	kmail/kmmainwidget.cpp
	kmail/kmmainwidget.h
	kmail/kmreadermainwin.cpp
	kmail/mailmerge/tests/CMakeLists.txt
	kmail/tests/CMakeLists.txt
	korganizer/CMakeLists.txt
	korganizer/akonadicollectionview.cpp

Conflicts:
	akonadi_next/CMakeLists.txt
	akonadi_next/amazingcompleter.cpp
	akonadi_next/amazingcompleter.h
	akonadi_next/amazingdelegate.cpp
	akonadi_next/amazingdelegate.h
	akonadi_next/kreparentingproxymodel.cpp
	akonadi_next/kreparentingproxymodel.h
	akonadi_next/note.cpp
	akonadi_next/note.h
	akonadi_next/notecreatorandselector.cpp
	kjots/CMakeLists.txt
	kjots/kjotsmodel.cpp
	kjots/kjotswidget.cpp
	kjots/localresourcecreator.cpp
	kjots/plasmoid/CMakeLists.txt
	kjots/plasmoid/akonotes_noteapplet.cpp
	kjots/plasmoid/akonotes_noteslistapplet.cpp
	knotes/CMakeLists.txt
	knotes/apps/knotesapp.cpp
	knotes/configdialog/knotecollectionconfigwidget.cpp
	knotes/print/autotests/CMakeLists.txt
	knotes/print/autotests/knotesgrantleeprinttest.cpp
	kontact/plugins/knotes/CMakeLists.txt
	kontact/plugins/knotes/kcmknotessummary.cpp
	kontact/plugins/knotes/knoteseditdialog.cpp
	mobile/notes/mainview.cpp
	noteshared/CMakeLists.txt
	noteshared/akonadi/noteschangerecorder.cpp
	noteshared/dialog/selectednotefolderdialog.cpp
	noteshared/job/createnewnotejob.cpp
	sieveeditor/autotests/CMakeLists.txt
	storageservicemanager/autotests/CMakeLists.txt
	storageservicemanager/storageserviceconfiguredialog.cpp

If a static build is required use the generic BUILD_SHARED_LIBS from
extra-cmake-modules.

Conflicts:
	kmailcvt/kselfilterpage.cpp
	knotes/configdialog/knotecollectionconfigwidget.cpp

it will create a mail folder on a kolab server for example.
=> need to update kdepimlibs

Conflicts:
	agents/notesagent/notesagent.cpp
	knotes/configdialog/knoteconfigdialog.cpp
	knotes/settings/globalsettings.cpp
	knotes/settings/globalsettings.h
	noteshared/job/createnewnotejob.cpp
	noteshared/settings/globalsettings.cpp
	noteshared/settings/globalsettings.h

Fix Bug 344564 - Dialog window asking for "folder to save notes" each time I receive a note or create a new one

FIXED-IN: 4.14.6
BUG: 344564

Conflicts:
	agents/sendlateragent/sendlatertimedatewidget.cpp
	agents/sendlateragent/tests/CMakeLists.txt