# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1163861282 0
# Node ID 15a2bab0c8a6c576595ff29de148a659ed8535f6
# Parent  97b5b479183fae3fc1333201215e68454998dc49
*** empty log message ***

diff -r 97b5b479183f -r 15a2bab0c8a6 man/ChangeLog
--- a/man/ChangeLog	Sat Nov 18 14:47:46 2006 +0000
+++ b/man/ChangeLog	Sat Nov 18 14:48:02 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* Makefile.in (emacs.dvi): Remove xresmini.texi
+
+	* emacs: Include xresources.texi both for info and dvi.
+
+	* xresources.texi: Merge text from xresmini.texi
+
 2006-11-17  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi: Fix typos.