diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-01 07:43:34 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-01 07:43:34 +0000 |
commit | ba3189039adc8ec5eba5ed3e21d42019a4616b7c (patch) | |
tree | c1962f828bc3337f1bf76632e85610cea31d1534 /admin/bzrmerge.el | |
parent | 91415fb1cd0f913be6e8a2409b0d9cdca4352f3f (diff) | |
download | emacs-ba3189039adc8ec5eba5ed3e21d42019a4616b7c.tar.gz |
Update copyright year to 2014 by running 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 42d39d3071a..924033b1554 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-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: maint |