summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/shared/VTsw_usl.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:12 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:12 +0000
commit505fe2ba307e9270627ca7f3cb6b4e1dbacc327b (patch)
treead19dfe52ca3f84a6f669acac195d296ed38ad08 /hw/xfree86/os-support/shared/VTsw_usl.c
parent1b22db1ebcf1ba98ca8519fa38210e275373f8f6 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
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 'hw/xfree86/os-support/shared/VTsw_usl.c')
-rw-r--r--hw/xfree86/os-support/shared/VTsw_usl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 81aac54de..4ddb84450 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@XFree86.org>
*