diff options
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 4 insertions, 1 deletions
| @@ -1,5 +1,8 @@ | |||
| 1 | 2015-01-01 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2015-01-01 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Update copyright year to 2015 | ||
| 4 | Run admin/update-copyright. | ||
| 5 | |||
| 3 | Merge from gnulib, incorporating: | 6 | Merge from gnulib, incorporating: |
| 4 | 2015-01-01 version-etc: new year | 7 | 2015-01-01 version-etc: new year |
| 5 | 8 | ||
| @@ -14546,7 +14549,7 @@ | |||
| 14546 | ;; coding: utf-8 | 14549 | ;; coding: utf-8 |
| 14547 | ;; End: | 14550 | ;; End: |
| 14548 | 14551 | ||
| 14549 | Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc. | 14552 | Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. |
| 14550 | 14553 | ||
| 14551 | This file is part of GNU Emacs. | 14554 | This file is part of GNU Emacs. |
| 14552 | 14555 | ||