diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
| commit | 7bf8e9d736765001111e3245da36817a5a42dd12 (patch) | |
| tree | 73d7246c3c4118bab88f4110fb570e0202eaf82d /src/alp_xaam.c | |
| parent | 14f3d1571c6ce463da1b349192a2981d0e1188fa (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).
Diffstat (limited to 'src/alp_xaam.c')
| -rw-r--r-- | src/alp_xaam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alp_xaam.c b/src/alp_xaam.c index 2f25092..5b4ab25 100644 --- a/src/alp_xaam.c +++ b/src/alp_xaam.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ /* #define DEBUG */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.8 2002/07/10 02:36:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" |