[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS: cvs.openbsd.org: X11



CVSROOT:	/cvs
Module name:	X11
Changes by:	matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	99/05/02 13:17:44

Modified files:
	xc/programs/xlockmore: Imakefile iconfig.h 
	xc/programs/xlockmore/modes: Imakefile life.c 
	xc/programs/xlockmore/xlock: XLock.ad passwd.c xlock.c xlock.man 

Log message:
resolve conflicts




Visit your host, monkey.org