OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
 
CVS: cvs.openbsd.org: XF4

From: Matthieu Herrb (matthieucvs.openbsd.org)
Date: Fri Feb 13 2004 - 16:57:40 CST

CVSROOT: /cvs
Module name: XF4
Changes by: matthieucvs.openbsd.org 2004/02/13 15:57:40

Modified files:
        xc/fonts/bdf/misc: Imakefile
        xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86:
                                                                 host.def
        xc/programs/xconsole: Imakefile
        xc/programs/xdm/config: Startup_0

Log message:
2nd round of merge/conflict resolutions for last import.