Mercurial > hg > xemacs-beta

diff man/ChangeLog @ 5497:70af4098e14f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge by hand with the changeset that backed out e82f5b7010fe. man/ChangeLog addition: 2011-05-02 Aidan Kehoe <kehoea@parhasard.net> * Makefile: * texinfo.tex: Merge by hand with the changeset that backed out e82f5b7010fe (e82f5b7010fe is incompatible with deployed versions of makeinfo as of today).
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 02 May 2011 10:51:26 +0100
parents 1f0b15040456 a7da359711ce
children 3fe8358ad59a
line wrap: on
line diff
--- a/man/ChangeLog	Sun May 01 18:44:03 2011 +0100
+++ b/man/ChangeLog	Mon May 02 10:51:26 2011 +0100
@@ -1,3 +1,11 @@
+2011-05-02  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* Makefile: 
+	* texinfo.tex:
+	Merge by hand with the changeset that backed out e82f5b7010fe
+	(e82f5b7010fe is incompatible with deployed versions of makeinfo
+	as of today).
+
 2011-04-29  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.31 "ginger" is released.