Commit 5a8ecaae authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/KDE/4.14'

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
parents f63a2688 e20a4ee8
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment