summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
commit29403acb42c3eed77be49ca9d15b6b5f3ad07f05 (patch)
treecc74480cedf219477246b70d92f81bdb662f237b
parent4aac13cd2b14ee1180eb54fa8190eca6ea06a3e8 (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).
-rw-r--r--man/XDGA.man2
-rw-r--r--src/XF86DGA.c2
-rw-r--r--src/XF86DGA2.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/man/XDGA.man b/man/XDGA.man
index d13c4bf..a2ebfd7 100644
--- a/man/XDGA.man
+++ b/man/XDGA.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/lib/Xxf86dga/XDGA.man,v 1.1 2003/11/22 01:33:31 dawes Exp $
+.\" $XFree86$
.\"
.TH XDGA 3 __vendorversion__ "XFree86"
.SH NAME
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index b60c377..62cf81e 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.24 2003/05/05 20:42:30 tsi Exp $ */
+/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.23tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 4dd7de8..ab91744 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.24 2003/11/21 05:07:16 dawes Exp $ */
+/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs