Commit 45c12d46 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

Conflicts:
	kmail/kmstartup.cpp
	messagecomposer/helper/messagehelper.cpp
	pimsettingexporter/abstractimportexportjob.cpp
	pimsettingexporter/addressbook/exportaddressbookjob.cpp
	pimsettingexporter/alarm/exportalarmjob.cpp
	pimsettingexporter/calendar/exportcalendarjob.cpp
	pimsettingexporter/jot/exportjotjob.cpp
	pimsettingexporter/mail/exportmailjob.cpp
	pimsettingexporter/notes/exportnotesjob.cpp
parents 8711e869 eb5a85a1
KAlarm Change Log
=== Version 2.10.12 --- 30 September 2014 ===
=== Version 2.10.12 (KDE 4.14.2) --- 30 September 2014 ===
- Make New Audio Alarm dialogue use sound file repeat preference setting.
=== Version 2.10.11 (KDE 4.14.0) --- 12 August 2014 ===
......
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