diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:36 +0000 |
| commit | fa8a01f1b031f8c9843c565e6fee6422f035345d (patch) | |
| tree | de803547c2ed5d590bb3b73ffa051b10550d34c5 /src/ffb_accel.c | |
| parent | 63171bc9c854f8aeb53a6579a579e5371c5bcf63 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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/ffb_accel.c')
| -rw-r--r-- | src/ffb_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ffb_accel.c b/src/ffb_accel.c index 9aeb71d..f101739 100644 --- a/src/ffb_accel.c +++ b/src/ffb_accel.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.7 2003/11/10 18:22:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.6tsi Exp $ */ #include "scrnintstr.h" #include "pixmapstr.h" |