diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | 4eb7f92955667d6a5c6128536e40afcbdc7857ee (patch) | |
| tree | 3e3790beeccb950c6c83b326ad4775c9c95a7259 | |
| parent | a0edf071ab0fda73384b3ac11e47a8d58ea0c091 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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-- | man/AppleWM.3 | 2 | ||||
| -rw-r--r-- | src/applewm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/AppleWM.3 b/man/AppleWM.3 index 7ca9e3c..9a0419b 100644 --- a/man/AppleWM.3 +++ b/man/AppleWM.3 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/lib/apple/AppleWM.man,v 1.2 2003/09/16 00:36:08 torrey Exp $ +.\" $XFree86: xc/lib/apple/AppleWM.man,v 1.1 2003/08/12 23:47:10 torrey Exp $ .\" .\" Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. .\" Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved. diff --git a/src/applewm.c b/src/applewm.c index 3187549..6a1142f 100644 --- a/src/applewm.c +++ b/src/applewm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/apple/applewm.c,v 1.1 2003/08/12 23:47:10 torrey Exp $ */ +/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.12 2001/08/27 17:40:57 dawes Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. |