diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:27 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:27 +0000 |
commit | f14d9f6a45e38605cffd5b9b5c2bb48cf86be137 (patch) | |
tree | 31598164e6ec0735cdb1c07890161104302cfff7 | |
parent | 460045722de149d58558a8df968627218060ca76 (diff) | |
download | xorg-lib-libXp-XACE-SELINUX-BASE.tar.gz |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | src/XpAttr.c | 2 | ||||
-rw-r--r-- | src/XpContext.c | 2 | ||||
-rw-r--r-- | src/XpDoc.c | 2 | ||||
-rw-r--r-- | src/XpExtUtil.c | 2 | ||||
-rw-r--r-- | src/XpExtUtil.h | 2 | ||||
-rw-r--r-- | src/XpExtVer.c | 2 | ||||
-rw-r--r-- | src/XpGetData.c | 2 | ||||
-rw-r--r-- | src/XpImageRes.c | 2 | ||||
-rw-r--r-- | src/XpInput.c | 2 | ||||
-rw-r--r-- | src/XpJob.c | 2 | ||||
-rw-r--r-- | src/XpLocale.c | 2 | ||||
-rw-r--r-- | src/XpNotifyPdm.c | 2 | ||||
-rw-r--r-- | src/XpPage.c | 2 | ||||
-rw-r--r-- | src/XpPageDim.c | 2 | ||||
-rw-r--r-- | src/XpPrinter.c | 2 | ||||
-rw-r--r-- | src/XpPutData.c | 2 | ||||
-rw-r--r-- | src/XpScreens.c | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/src/XpAttr.c b/src/XpAttr.c index b8d5ec3..6c1839e 100644 --- a/src/XpAttr.c +++ b/src/XpAttr.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.6 2001/01/17 19:43:01 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpContext.c b/src/XpContext.c index 9415b4b..00dfd2e 100644 --- a/src/XpContext.c +++ b/src/XpContext.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpContext.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpContext.c,v 1.6 2001/10/28 03:32:39 tsi Exp $ */ #define NEED_REPLIES diff --git a/src/XpDoc.c b/src/XpDoc.c index 2a78feb..84f6e83 100644 --- a/src/XpDoc.c +++ b/src/XpDoc.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpDoc.c,v 1.4 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpDoc.c,v 1.3 2001/01/17 19:43:01 dawes Exp $ */ #include <X11/extensions/Printstr.h> #include <X11/Xlibint.h> diff --git a/src/XpExtUtil.c b/src/XpExtUtil.c index e69dc1e..5a40d84 100644 --- a/src/XpExtUtil.c +++ b/src/XpExtUtil.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtUtil.c,v 1.8 2003/11/21 05:13:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtUtil.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/src/XpExtUtil.h b/src/XpExtUtil.h index a785a7e..81b5ce3 100644 --- a/src/XpExtUtil.h +++ b/src/XpExtUtil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xp/XpExtUtil.h,v 1.4 2003/11/17 22:20:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtUtil.h,v 1.3 2002/10/16 00:37:31 dawes Exp $ */ /* * Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/src/XpExtVer.c b/src/XpExtVer.c index 2e0e5c5..b2c497a 100644 --- a/src/XpExtVer.c +++ b/src/XpExtVer.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtVer.c,v 1.6 2003/11/21 05:13:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtVer.c,v 1.5 2002/10/16 00:37:31 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpGetData.c b/src/XpGetData.c index 1fb20b6..13adf12 100644 --- a/src/XpGetData.c +++ b/src/XpGetData.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpGetData.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpGetData.c,v 1.4 2001/01/17 19:43:02 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpImageRes.c b/src/XpImageRes.c index ec4666f..711691a 100644 --- a/src/XpImageRes.c +++ b/src/XpImageRes.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpImageRes.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpImageRes.c,v 1.4 2001/01/17 19:43:02 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpInput.c b/src/XpInput.c index 3b3d5f8..9a112a2 100644 --- a/src/XpInput.c +++ b/src/XpInput.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpInput.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpInput.c,v 1.4 2001/01/17 19:43:02 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpJob.c b/src/XpJob.c index 803551d..677bcb3 100644 --- a/src/XpJob.c +++ b/src/XpJob.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpJob.c,v 1.6 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpJob.c,v 1.5 2002/04/10 16:20:07 tsi Exp $ */ #if defined(sun) && defined(i386) && defined(SVR4) && !defined(__EXTENSIONS__) #define __EXTENSIONS__ diff --git a/src/XpLocale.c b/src/XpLocale.c index 497092f..204a863 100644 --- a/src/XpLocale.c +++ b/src/XpLocale.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpLocale.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpLocale.c,v 1.4 2001/01/17 19:43:02 dawes Exp $ */ #include <X11/extensions/Printstr.h> #include <X11/Xlibint.h> diff --git a/src/XpNotifyPdm.c b/src/XpNotifyPdm.c index fb60fab..fed4911 100644 --- a/src/XpNotifyPdm.c +++ b/src/XpNotifyPdm.c @@ -41,7 +41,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpNotifyPdm.c,v 1.8 2003/12/22 17:48:04 tsi Exp $ */ +/* $XFree86: xc/lib/Xp/XpNotifyPdm.c,v 1.7tsi Exp $ */ #include <X11/extensions/Print.h> #include <X11/Xlibint.h> diff --git a/src/XpPage.c b/src/XpPage.c index cfef7c4..4388007 100644 --- a/src/XpPage.c +++ b/src/XpPage.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPage.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPage.c,v 1.4 2001/12/19 21:28:44 dawes Exp $ */ #include <X11/extensions/Printstr.h> #include <X11/Xlibint.h> diff --git a/src/XpPageDim.c b/src/XpPageDim.c index 35f190c..175cc89 100644 --- a/src/XpPageDim.c +++ b/src/XpPageDim.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPageDim.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPageDim.c,v 1.4 2001/01/17 19:43:02 dawes Exp $ */ #define NEED_REPLIES diff --git a/src/XpPrinter.c b/src/XpPrinter.c index ae73c93..8e16121 100644 --- a/src/XpPrinter.c +++ b/src/XpPrinter.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.9 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.8 2001/04/01 14:00:02 tsi Exp $ */ #define NEED_REPLIES diff --git a/src/XpPutData.c b/src/XpPutData.c index 96c5e7d..5174d71 100644 --- a/src/XpPutData.c +++ b/src/XpPutData.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPutData.c,v 1.4 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPutData.c,v 1.3 2001/01/17 19:43:02 dawes Exp $ */ #include <X11/extensions/Printstr.h> #include <X11/Xlibint.h> diff --git a/src/XpScreens.c b/src/XpScreens.c index f301de1..d4d0f5d 100644 --- a/src/XpScreens.c +++ b/src/XpScreens.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpScreens.c,v 1.6 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpScreens.c,v 1.5 2001/04/01 14:00:02 tsi Exp $ */ #define NEED_REPLIES |