diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:39 +0000 |
| commit | 935652e8217a0678732c4f38a1a5940f7721a362 (patch) | |
| tree | 679cd60010022ee627b4cc0cb07254fffed7be6b | |
| parent | c934cacff1787eab38dfa1ed91189c28cd5686ad (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/vga.man | 2 | ||||
| -rw-r--r-- | src/generic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/vga.man b/man/vga.man index 5781c1b..1d4e87f 100644 --- a/man/vga.man +++ b/man/vga.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3 2001/12/17 20:52:34 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VGA __drivermansuffix__ __vendorversion__ diff --git a/src/generic.c b/src/generic.c index 2829049..ac20129 100644 --- a/src/generic.c +++ b/src/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65 2003/10/30 17:37:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.64 2003/08/23 16:09:23 dawes Exp $ */ /* * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * |