Mercurial > hg > xemacs-beta

diff man/ChangeLog @ 5508:3fe8358ad59a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge, restoring Ben's GPLv3 manual changes.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 09 May 2011 20:47:31 +0100
parents 70af4098e14f 64be8a494bdc
children 4aa8ee813265
line wrap: on
line diff
--- a/man/ChangeLog	Sun May 08 09:19:25 2011 +0100
+++ b/man/ChangeLog	Mon May 09 20:47:31 2011 +0100
@@ -1,11 +1,3 @@
-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.