diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /lisp/loadup.el | |
parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.bz2 emacs-5db5064395c251a822e429e19ddecb74a974b6ef.zip |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r-- | lisp/loadup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index e0174fcdb19..aefe91405cf 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,6 +1,6 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs -;; Copyright (C) 1985-1986, 1992, 1994, 2001-2020 Free Software +;; Copyright (C) 1985-1986, 1992, 1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org |