diff options
| author | Paul Eggert | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /lisp/image | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip | |
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/image')
| -rw-r--r-- | lisp/image/compface.el | 2 | ||||
| -rw-r--r-- | lisp/image/gravatar.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/image/compface.el b/lisp/image/compface.el index 67b9ca3474a..23752618542 100644 --- a/lisp/image/compface.el +++ b/lisp/image/compface.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; compface.el --- functions for converting X-Face headers | 1 | ;;; compface.el --- functions for converting X-Face headers |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2018 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2019 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 | ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 6 | ;; Keywords: news | 6 | ;; Keywords: news |
diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el index e7c472db1df..cf61119ab2e 100644 --- a/lisp/image/gravatar.el +++ b/lisp/image/gravatar.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gravatar.el --- Get Gravatars | 1 | ;;; gravatar.el --- Get Gravatars |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2018 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2019 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Julien Danjou <julien@danjou.info> | 5 | ;; Author: Julien Danjou <julien@danjou.info> |
| 6 | ;; Keywords: news | 6 | ;; Keywords: news |