diff options
| author | jave <joakim@verona.se> | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave <joakim@verona.se> | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /lisp/url/ChangeLog | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz | |
merge master
Diffstat (limited to 'lisp/url/ChangeLog')
| -rw-r--r-- | lisp/url/ChangeLog | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 4091d2eb722..1f5ece02113 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -3051,7 +3051,8 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1999, 2001-2002, 2004-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2002, 2004-2015 Free Software Foundation, + Inc. This file is part of GNU Emacs. |