Skip to content
Commit 17914381 authored by Laurent Montel's avatar Laurent Montel
Browse files

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

Conflicts:
	akonadi/autotests/testresource/knutresource.h
	akonadi/tests/testresource/knutresource.cpp
	kalarmcal/src/kaevent.cpp
parents b061f029 0504e348
Hide whitespace changes
Inline Side-by-side
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