Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h

5 files changed, 0 insertions, 36 deletions

diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c
index 60e340dc1..5f58de7ec 100644
--- a/hw/xprint/ValTree.c
+++ b/hw/xprint/ValTree.c
@@ -29,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86$ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c
index a24c1076b..d8ee5adf8 100644
--- a/hw/xprint/attributes.c
+++ b/hw/xprint/attributes.c
@@ -1375,7 +1375,6 @@ ReplaceAllKeywords(
     defined(__CYGWIN__) || \
     (defined(sun) && !defined(SVR4)) || \
     (defined(SVR4) && !defined(sun) && !defined(__UNIXWARE__)) || \
-    defined(__UNIXOS2__) || \
     defined(ISC) || \
     defined(Lynx) || \
     defined(__QNX__) || \
diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c
index 716c48d6d..9e993f79c 100644
--- a/hw/xprint/pcl/PclFonts.c
+++ b/hw/xprint/pcl/PclFonts.c
@@ -12,7 +12,6 @@
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86$ */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
 (c) Copyright 1996 International Business Machines Corp.
diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c
index 734ec5f27..183225274 100644
--- a/hw/xprint/pcl/PclInit.c
+++ b/hw/xprint/pcl/PclInit.c
@@ -44,38 +44,6 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-/*
-(c) Copyright 1996 Hewlett-Packard Company
-(c) Copyright 1996 International Business Machines Corp.
-(c) Copyright 1996 Sun Microsystems, Inc.
-(c) Copyright 1996 Novell, Inc.
-(c) Copyright 1996 Digital Equipment Corp.
-(c) Copyright 1996 Fujitsu Limited
-(c) Copyright 1996 Hitachi, Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the copyright holders shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from said
-copyright holders.
-*/
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c
index e3022b0c4..69b5eed0e 100644
--- a/hw/xprint/spooler.c
+++ b/hw/xprint/spooler.c
@@ -1,4 +1,3 @@
-
 /*
 Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
 Copyright (c) 2004      Sun Microsystems, Inc.