18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

15 files changed, 15 insertions, 15 deletions

diff --git a/koi12x24.bdf b/koi12x24.bdf
index d6d18c7..ca684ef 100644
--- a/koi12x24.bdf
+++ b/koi12x24.bdf
@@ -5,7 +5,7 @@ COMMENT in both source and binary form provided that the copyright
 COMMENT and these terms are retained. Under no circumstances is the author
 COMMENT responsible for the proper functioning of this software, nor does
 COMMENT the author assume any responsibility for damages incurred with its use.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi12x24.bdf,v 3.2 2002/12/15 01:49:06 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--24-170-100-100-C-120-KOI8-R
 SIZE 17 100 100
 FONTBOUNDINGBOX 12 26 0 -3
diff --git a/koi12x24b.bdf b/koi12x24b.bdf
index fc89e9d..17a997f 100644
--- a/koi12x24b.bdf
+++ b/koi12x24b.bdf
@@ -2,7 +2,7 @@ STARTFONT 2.1
 COMMENT Based on standard 12x24 fixed bold font.
 COMMENT Created 2000 by S. Winitzki.
 COMMENT May be distributed and modified without restrictions.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi12x24b.bdf,v 1.1 2002/12/15 01:49:06 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-Normal--24-170-100-100-C-120-KOI8-R
 SIZE 17 100 100
 FONTBOUNDINGBOX 12 25 0 -2
diff --git a/koi5x8.bdf b/koi5x8.bdf
index ca572a3..1a7a07c 100644
--- a/koi5x8.bdf
+++ b/koi5x8.bdf
@@ -6,7 +6,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT $Id$
 COMMENT Send bug reports to Markus Kuhn <mkuhn@acm.org>
 COMMENT Changes 1999 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi5x8.bdf,v 1.1 2002/12/15 01:49:06 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--8-80-75-75-C-50-KOI8-R
 SIZE 11 75 75
 FONTBOUNDINGBOX 5 8 0 -1
diff --git a/koi6x13.bdf b/koi6x13.bdf
index 9c51b60..59b2db3 100644
--- a/koi6x13.bdf
+++ b/koi6x13.bdf
@@ -8,7 +8,7 @@ COMMENT in both source and binary form provided that the copyright
 COMMENT and these terms are retained. Under no circumstances is the author
 COMMENT responsible for the proper functioning of this software, nor does
 COMMENT the author assume any responsibility for damages incurred with its use.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x13.bdf,v 3.2 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-SemiCondensed--13-120-75-75-C-60-KOI8-R
 SIZE 13 75 75
 FONTBOUNDINGBOX 6 18 0 -5
diff --git a/koi6x13b.bdf b/koi6x13b.bdf
index f88815b..57247a8 100644
--- a/koi6x13b.bdf
+++ b/koi6x13b.bdf
@@ -5,7 +5,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 6x13B.bdf,v 1.21 1999-12-13 10:23:03+00 mgk25 Exp mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
 COMMENT Changes 1999 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x13b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-SemiCondensed--13-120-75-75-C-60-KOI8-R
 SIZE 13 75 75
 FONTBOUNDINGBOX 6 13 0 -2
diff --git a/koi6x9.bdf b/koi6x9.bdf
index 77091a4..00b52ca 100644
--- a/koi6x9.bdf
+++ b/koi6x9.bdf
@@ -5,7 +5,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT Id: 6x9.bdf,v 1.13 1999-11-06 20:18:24+00 mgk25 Exp mgk25 $
 COMMENT Send bug reports to Markus Kuhn <mkuhn@acm.org>
 COMMENT Changes 1999 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x9.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-KOI8-R
 SIZE 9 75 75
 FONTBOUNDINGBOX 6 9 0 -2
diff --git a/koi7x14.bdf b/koi7x14.bdf
index 2a8ef0b..a3c5d3c 100644
--- a/koi7x14.bdf
+++ b/koi7x14.bdf
@@ -6,7 +6,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 7x14.bdf,v 1.37 1999-12-13 10:12:19+00 mgk25 Exp mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
 COMMENT Changes 2000 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-70-KOI8-R
 SIZE 7 75 75
 FONTBOUNDINGBOX 7 14 0 -2
diff --git a/koi7x14b.bdf b/koi7x14b.bdf
index b0f0afc..b11ed9d 100644
--- a/koi7x14b.bdf
+++ b/koi7x14b.bdf
@@ -6,7 +6,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 7x14B.bdf,v 1.19 1999-12-13 10:50:31+00 mgk25 Exp mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
 COMMENT Changes 2000 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-Normal--14-130-75-75-C-70-KOI8-R
 SIZE 7 75 75
 FONTBOUNDINGBOX 7 14 0 -2
diff --git a/koi8x13.bdf b/koi8x13.bdf
index 39a165e..6ee1dae 100644
--- a/koi8x13.bdf
+++ b/koi8x13.bdf
@@ -5,7 +5,7 @@ COMMENT from an ISO10646-1 encoded source BDF font.
 COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 8x13.bdf,v 1.46 1999-11-13 20:49:01+00 mgk25 Exp mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi8x13.bdf,v 3.2 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--13-120-75-75-C-80-KOI8-R
 SIZE 13 75 75
 FONTBOUNDINGBOX 8 13 0 -2
diff --git a/koi8x16.bdf b/koi8x16.bdf
index 0f90879..ba53361 100644
--- a/koi8x16.bdf
+++ b/koi8x16.bdf
@@ -1,7 +1,7 @@
 STARTFONT 2.1
 COMMENT Modified by Serge Winitzki. 1999. Based on standard 8x16 fixed font.
 COMMENT May be distributed and modified without restrictions.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi8x16.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--16-160-75-75-C-80-KOI8-R
 SIZE 16 75 75
 FONTBOUNDINGBOX 8 16 0 -2
diff --git a/koi8x16b.bdf b/koi8x16b.bdf
index 3399eb3..7c0ccab 100644
--- a/koi8x16b.bdf
+++ b/koi8x16b.bdf
@@ -1,7 +1,7 @@
 STARTFONT 2.1
 COMMENT Created by Serge Winitzki, 1999. Based on standard 8x16 console font.
 COMMENT May be distributed and modified without restriction.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi8x16b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-Normal--16-160-75-75-C-80-KOI8-R
 SIZE 16 75 75
 FONTBOUNDINGBOX 8 16 0 -4
diff --git a/koi9x15.bdf b/koi9x15.bdf
index 7b63fea..180faaf 100644
--- a/koi9x15.bdf
+++ b/koi9x15.bdf
@@ -5,7 +5,7 @@ COMMENT from an ISO10646-1 encoded source BDF font.
 COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 9x15.bdf,v 1.64 1999-11-13 20:49:01+00 mgk25 Exp mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x15.bdf,v 3.2 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--15-140-75-75-C-90-KOI8-R
 SIZE 15 75 75
 FONTBOUNDINGBOX 9 15 0 -3
diff --git a/koi9x15b.bdf b/koi9x15b.bdf
index c9c95e0..5a6ad31 100644
--- a/koi9x15b.bdf
+++ b/koi9x15b.bdf
@@ -1,6 +1,6 @@
 STARTFONT 2.1
 COMMENT "Created by Serge Winitzki, 1999. Free distribution."
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x15b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-Normal--15-140-75-75-C-90-KOI8-R
 SIZE 11 75 75
 FONTBOUNDINGBOX 9 15 0 -3
diff --git a/koi9x18.bdf b/koi9x18.bdf
index bc46b28..174f44f 100644
--- a/koi9x18.bdf
+++ b/koi9x18.bdf
@@ -6,7 +6,7 @@ COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 9x18.bdf,v 1.40 1999-11-20 11:52:26+00 mgk25 Rel mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
 COMMENT Changes 1999 by Serge Winitzki.
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Medium-R-Normal--18-120-100-100-C-90-KOI8-R
 SIZE 12 100 100
 FONTBOUNDINGBOX 9 18 0 -4
diff --git a/koi9x18b.bdf b/koi9x18b.bdf
index 6e99f9e..f011d6e 100644
--- a/koi9x18b.bdf
+++ b/koi9x18b.bdf
@@ -5,7 +5,7 @@ COMMENT from an ISO10646-1 encoded source BDF font.
 COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999.
 COMMENT "Id: 9x18B.bdf,v 1.7 1999-11-21 16:03:33+00 mgk25 Rel mgk25 $"
 COMMENT "Send bug reports to Markus Kuhn <mkuhn@acm.org>"
-COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $
+COMMENT $XFree86$
 FONT -Misc-Fixed-Bold-R-Normal--18-120-100-100-C-90-KOI8-R
 SIZE 12 100 100
 FONTBOUNDINGBOX 9 18 0 -4