mrg
Mon Jun 30 19:17:19 PDT 1997
Update of /cvsroot/xsrc/xc/config/cf
In directory netbsd1:/var/slash-tmp/xsrc/xc/config/cf

Modified Files:
	Imake.cf NetBSD.cf xf86site.def 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:22 PDT 1997
Update of /cvsroot/xsrc/xc/config/imake
In directory netbsd1:/var/slash-tmp/xsrc/xc/config/imake

Modified Files:
	imake.c imakemdep.h 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:24 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver

Modified Files:
	Imakefile 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:25 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/PEX5/ddpex/mi/level4
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/PEX5/ddpex/mi/level4

Modified Files:
	miWks.c 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:26 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/XIE/mixie/jpeg
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/XIE/mixie/jpeg

Modified Files:
	jconfig.h 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:29 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/cfb
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/cfb

Modified Files:
	cfb.h cfb8line.c 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:30 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/hw/sun
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/hw/sun

Modified Files:
	sunCfb.c 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:32 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32

Modified Files:
	cfb8line.c cfbglblt8.c 
Log Message:
merge xfree86 3.3

mrg
Mon Jun 30 19:17:33 PDT 1997
Update of /cvsroot/xsrc/xc/programs/Xserver/include
In directory netbsd1:/var/slash-tmp/xsrc/xc/programs/Xserver/include

Modified Files:
	servermd.h 
Log Message:
merge xfree86 3.3