comparison admin/ChangeLog @ 112229:41f5a96a1e35

ChangeLog merge fixes.
author Glenn Morris <rgm@gnu.org>
date Fri, 14 Jan 2011 09:42:40 -0800
parents 417b1e4d63cd
children 8f641c1fc9cc 17e0028efc29
comparison
equal deleted inserted replaced
112228:417b1e4d63cd 112229:41f5a96a1e35
1 2011-01-14 Glenn Morris <rgm@gnu.org> 1 2011-01-14 Glenn Morris <rgm@gnu.org>
2 2
3 * admin.el (set-copyright): Also handle \year in refcards/*.tex. 3 * admin.el (set-copyright): Also handle \year in refcards/*.tex.
4 4
5 2011-01-14 Eli Zaretskii <eliz@gnu.org>
6 2011-01-14 Glenn Morris <rgm@gnu.org> 5 2011-01-14 Glenn Morris <rgm@gnu.org>
7 6
8 * bzrmerge.el: Require cl when compiling. 7 * bzrmerge.el: Require cl when compiling.
9 (bzrmerge-merges): Doc fix. 8 (bzrmerge-merges): Doc fix.
10 9