Merge branch 'uj-icalendar-bug#5433'

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index 47bbfb36a1020b2f51e77295df315bc83db80e4a..6e350cf8ec1865263210f4fdc341ab88ab3b89f3 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
+
+       * automated/icalendar-tests.el (icalendar-tests--test-export): New
+       optional parameter `alarms'.
+       (icalendar-export-alarms): New test for exporting icalendar
+       alarms.
+       (icalendar-tests--test-cycle): Let `icalendar-export-alarms' be nil.
+
 2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
 
        * automated/icalendar-tests.el (icalendar-tests--test-import):