aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorUlf Jasper2014-11-17 21:00:24 +0100
committerUlf Jasper2014-11-17 21:00:24 +0100
commitcc5519db12f554a40591ac8a7f4febe17a3bd53b (patch)
tree27fdb0974ed8c756b17d023d497b1ce69749583a /lisp/ChangeLog
parent62243cb96f133581157f6eafa934b5b7ca4cc065 (diff)
parent16b5f507688b32b78843620417bb2176b3131752 (diff)
downloademacs-cc5519db12f554a40591ac8a7f4febe17a3bd53b.tar.gz
emacs-cc5519db12f554a40591ac8a7f4febe17a3bd53b.zip
Merge branch 'uj-icalendar-bug#5433'
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c30a2dd9b4d..b232210f3c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12014-11-17 Ulf Jasper <ulf.jasper@web.de>
2
3 * calendar/icalendar.el (icalendar-export-alarms): New
4 customizable variable.
5 (icalendar-export-region): Export alarms as specified in
6 `icalendar-export-alarms'.
7 (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm):
8 New functions for exporting alarms.
9
12014-11-17 Paul Eggert <eggert@cs.ucla.edu> 102014-11-17 Paul Eggert <eggert@cs.ucla.edu>
2 11
3 Port new time stamp handling to old Emacs and to XEmacs. 12 Port new time stamp handling to old Emacs and to XEmacs.