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 /src/XpScreens.c | |
| parent | 460045722de149d58558a8df968627218060ca76 (diff) | |
| download | xorg-lib-libXp-f14d9f6a45e38605cffd5b9b5c2bb48cf86be137.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).
Diffstat (limited to 'src/XpScreens.c')
| -rw-r--r-- | src/XpScreens.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |