diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 14:26:41 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 14:26:41 -0800 |
| commit | 7e09ef09a479731d01b1ca46e94ddadd73ac98e3 (patch) | |
| tree | 402540bff550161e65a04d78785c3b2c543f5853 /admin/bzrmerge.el | |
| parent | 647c7c9a726c4f6d29cc8f932e434555f1d0aed8 (diff) | |
| download | emacs-7e09ef09a479731d01b1ca46e94ddadd73ac98e3.tar.gz | |
Update copyright year to 2015
Run admin/update-copyright.
Diffstat (limited to 'admin/bzrmerge.el')
| -rw-r--r-- | admin/bzrmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 924033b1554..7d4cd19230d 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -1,6 +1,6 @@ ;;; bzrmerge.el --- help merge one Emacs bzr branch to another -;; Copyright (C) 2010-2014 Free Software Foundation, Inc. +;; Copyright (C) 2010-2015 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: maint |