head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	netbsd-5-1-RC3:1.1.1.1.2.1
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	netbsd-5-0-1-RELEASE:1.1.1.1
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	xorg-server-1-4-2:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2009.06.11.02.14.02;	author mrg;	state dead;
branches;
next	1.1;

1.1
date	2008.07.31.19.50.47;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.07.31.19.50.47;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2009.09.17.03.35.30;	author snj;	state dead;
branches;
next	;


desc
@@


1.2
log
@merge xorg-server 1.6.1.190.

XXX: our Pci.[ch] changes need to be re-looked at, i think.
@
text
@INCLUDES = -I$(top_srcdir)/hw/xprint
 
AM_CFLAGS = @@DIX_CFLAGS@@ @@XPRINT_CFLAGS@@ -D_XP_PRINT_SERVER_ $(PCL_DRIVER)
 
libpcl_la_SOURCES =		\
	$(srcdir)/../pcl/PclArc.c	\
	$(srcdir)/../pcl/PclArea.c	\
	$(srcdir)/../pcl/PclAttr.c	\
	$(srcdir)/../pcl/PclAttVal.c	\
	$(srcdir)/../pcl/PclColor.c	\
	$(srcdir)/../pcl/PclCursor.c	\
	$(srcdir)/../pcl/PclDef.h	\
	$(srcdir)/../pcl/PclFonts.c	\
	$(srcdir)/../pcl/PclGC.c	\
	$(srcdir)/../pcl/Pcl.h		\
	$(srcdir)/../pcl/PclInit.c	\
	$(srcdir)/../pcl/PclLine.c	\
	$(srcdir)/../pcl/Pclmap.h	\
	$(srcdir)/../pcl/PclMisc.c	\
	$(srcdir)/../pcl/PclPixel.c	\
	$(srcdir)/../pcl/PclPolygon.c	\
	$(srcdir)/../pcl/PclPrint.c	\
	$(srcdir)/../pcl/PclSFonts.c	\
	$(srcdir)/../pcl/PclSFonts.h	\
	$(srcdir)/../pcl/PclSpans.c	\
	$(srcdir)/../pcl/PclText.c	\
	$(srcdir)/../pcl/PclWindow.c
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of xorg-server-1.4.2
@
text
@@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@@