CVS: cvs.openbsd.org: X11

[Matthieu Herrb <matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	X11
Changes by:	matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	1999/12/05 09:37:06

Modified files:
	xc/programs/xlockmore: iconfig.h 
	xc/programs/xlockmore/modes: Imakefile life.c 
	xc/programs/xlockmore/xlock: Imakefile XLock.ad passwd.c xlock.c 
	                             xlock.man 
Removed files:
	xc/programs/xlockmore/bitmaps: trek-0.xbm trek-1.xbm trek-2.xbm 

Log message:
resolve merge conficts