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 | 98ea2080fa460630d081ec5cbce3d2e27297f63d (patch) | |
tree | b2bc68ee5fa77353d137a4108d3d5c65fb3b41bc | |
parent | c94d31363f44ecb76914f98101d58c012f027c9b (diff) |
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-- | applewm.h | 2 | ||||
-rw-r--r-- | applewmstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/apple/applewm.h,v 1.2 2003/09/16 00:36:09 torrey Exp $ */ +/* $XFree86: xc/lib/apple/applewm.h,v 1.1 2003/08/12 23:47:10 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. diff --git a/applewmstr.h b/applewmstr.h index 10ca67d..392eaa8 100644 --- a/applewmstr.h +++ b/applewmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/apple/applewmstr.h,v 1.2 2003/09/16 00:36:09 torrey Exp $ */ +/* $XFree86: xc/lib/apple/applewmstr.h,v 1.1 2003/08/12 23:47:10 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. |