HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
declare smobs in alloc.c
[bpt/emacs.git]
/
admin
/
bzrmerge.el
diff --git
a/admin/bzrmerge.el
b/admin/bzrmerge.el
index
42d39d3
..
924033b
100644
(file)
--- a/
admin/bzrmerge.el
+++ b/
admin/bzrmerge.el
@@
-1,6
+1,6
@@
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
-;; Copyright (C) 2010-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 2010-201
4
Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint