diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /lisp/calendar/holidays.el | |
parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'lisp/calendar/holidays.el')
-rw-r--r-- | lisp/calendar/holidays.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 62b9d778e2e..2b080c30738 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -1,6 +1,6 @@ ;;; holidays.el --- holiday functions for the calendar package -*- lexical-binding:t -*- -;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2018 Free Software +;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2019 Free Software ;; Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> |