summaryrefslogtreecommitdiff
path: root/alias.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
commit56cd2e432b29a8a4bf4ba2e5411c116c50b7d87a (patch)
treef257883a326c92113f0078f27f1d2a61a4bc3066 /alias.c
parent5be0ac3f15b0de8981560ada5939e11a62a9d326 (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 'alias.c')
-rw-r--r--alias.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/alias.c b/alias.c
index 3447341..f228b0d 100644
--- a/alias.c
+++ b/alias.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.5 2002/07/01 02:26:00 tsi Exp $ */
+/* $XFree86$ */
#include "xkbcomp.h"
#include "misc.h"