wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev/kolab/merge/messageviewer-kf5'

Browse Source 
Conflicts:
	messageviewer/CMakeLists.txt
	messageviewer/autotests/noteedittest.h
	messageviewer/job/createeventjob.cpp
	messageviewer/viewer/viewer.cpp
	messageviewer/viewer/viewer_p.cpp
	messageviewer/viewer/viewer_p.h
	messageviewer/widgets/eventedit.cpp
	messageviewer/widgets/todoedit.cpp
wilder-work
Sandro Knauß 11 years ago
parent 04caaca824 6f971cf8f5
commit 69a6f61b78
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available