diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/url/ChangeLog | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
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 6da1e545be5..969d3c7d269 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -2801,7 +2801,8 @@ | |||
| 2801 | ;; coding: utf-8 | 2801 | ;; coding: utf-8 |
| 2802 | ;; End: | 2802 | ;; End: |
| 2803 | 2803 | ||
| 2804 | Copyright (C) 1999, 2001-2002, 2004-2012 Free Software Foundation, Inc. | 2804 | Copyright (C) 1999, 2001-2002, 2004-2013 Free Software |
| 2805 | Foundation, Inc. | ||
| 2805 | 2806 | ||
| 2806 | This file is part of GNU Emacs. | 2807 | This file is part of GNU Emacs. |
| 2807 | 2808 | ||