diff options
| author | Paul Eggert | 2015-01-01 14:26:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-01 14:26:41 -0800 |
| commit | 7e09ef09a479731d01b1ca46e94ddadd73ac98e3 (patch) | |
| tree | 402540bff550161e65a04d78785c3b2c543f5853 /admin/gitmerge.el | |
| parent | 647c7c9a726c4f6d29cc8f932e434555f1d0aed8 (diff) | |
| download | emacs-7e09ef09a479731d01b1ca46e94ddadd73ac98e3.tar.gz emacs-7e09ef09a479731d01b1ca46e94ddadd73ac98e3.zip | |
Update copyright year to 2015
Run admin/update-copyright.
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 206f12c08ad..43773f5cb35 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gitmerge.el --- help merge one Emacs branch into another | 1 | ;;; gitmerge.el --- help merge one Emacs branch into another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2014 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: David Engster <deng@randomsample.de> | 5 | ;; Authors: David Engster <deng@randomsample.de> |
| 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> | 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> |