Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Oct 23 23:01:49 UTC 2005

Modified Files:
	pkgsrc/x11/xdaemon: Makefile PLIST

Log Message:
Fixed typo (CONFLICT => CONFLICTS). Sorted PLIST. Bumped PKGREVISION.


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 pkgsrc/x11/xdaemon/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/xdaemon/PLIST

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