Subject: CVS commit: xsrc/xfree/xc/programs/xdm
To: None <source-changes@NetBSD.org>
From: Matthias Scheler <tron@netbsd.org>
List: source-changes
Date: 06/25/2005 17:42:14
Module Name:	xsrc
Committed By:	tron
Date:		Sat Jun 25 17:42:14 UTC 2005

Modified Files:
	xsrc/xfree/xc/programs/xdm: xdm.man

Log Message:
Resolve conflicts from XFree86 4.5.0 import. This fixes PR xsrc/30599 by
Juergen Hannken-Illjes.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 xsrc/xfree/xc/programs/xdm/xdm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.