summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:35 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:35 +0000
commit86cd7ade3f4e11aea956140624e144d16898f6e2 (patch)
tree73eba338c20cf3250b0536fd76cc43fa119db6a7
parent295d1bc87aada03e714be451b8899b32819d5278 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--man/XF86VM.man2
-rw-r--r--src/XF86VMode.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/XF86VM.man b/man/XF86VM.man
index b24eb98..7e2a689 100644
--- a/man/XF86VM.man
+++ b/man/XF86VM.man
@@ -5,7 +5,7 @@
.\"
.\"
.\" Copyright (c) 1996 Joe Moss, The XFree86 Project
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.15 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.14 2003/10/02 13:29:56 eich Exp $
.\"
.de ZN
.ie t \fB\^\\$1\^\fR\\$2
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 3259db4..75a49d2 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -1,5 +1,5 @@
/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
-/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.34 2002/12/22 00:46:51 dawes Exp $ */
+/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/*
Copyright (c) 1995 Kaleb S. KEITHLEY