summaryrefslogtreecommitdiff
path: root/lisp/menu-bar.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-31 17:57:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-31 17:57:29 -0800
commitba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree2e2047c81e96710011e49fc0e492d3c58df442b5 /lisp/menu-bar.el
parentd9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
downloademacs-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/menu-bar.el')
-rw-r--r--lisp/menu-bar.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1081fb4a052..98135852d1a 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1,6 +1,6 @@
;;; menu-bar.el --- define a default menu bar
-;; Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
;; Author: Richard M. Stallman
;; Maintainer: emacs-devel@gnu.org