svn merge ^/branches/released .

6 files changed, 112 insertions, 112 deletions

diff --git a/xorg-server/fonts.src/misc/cu12.bdf b/xorg-server/fonts.src/misc/cu12.bdf
index 0fecdff42..40e1e0aee 100644
--- a/xorg-server/fonts.src/misc/cu12.bdf
+++ b/xorg-server/fonts.src/misc/cu12.bdf
@@ -161069,8 +161069,8 @@ BITMAP
 80
 80
 ENDCHAR
-STARTCHAR uniFFE0
-ENCODING 65504
+STARTCHAR uniFFE1
+ENCODING 65505
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 10 13 3 -2
@@ -161089,8 +161089,8 @@ BITMAP
 9480
 6300
 ENDCHAR
-STARTCHAR uniFFE1
-ENCODING 65505
+STARTCHAR uniFFE2
+ENCODING 65506
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 12 9 2 0
@@ -161105,16 +161105,16 @@ FFF0
 0010
 0010
 ENDCHAR
-STARTCHAR uniFFE2
-ENCODING 65506
+STARTCHAR uniFFE3
+ENCODING 65507
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 16 1 0 12
 BITMAP
 FFFF
 ENDCHAR
-STARTCHAR uniFFE3
-ENCODING 65507
+STARTCHAR uniFFE4
+ENCODING 65508
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 1 14 7 -2
@@ -161134,8 +161134,8 @@ BITMAP
 80
 80
 ENDCHAR
-STARTCHAR uniFFE4
-ENCODING 65508
+STARTCHAR uniFFE5
+ENCODING 65509
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 11 12 2 -1
@@ -161153,8 +161153,8 @@ F1E0
 0400
 1F00
 ENDCHAR
-STARTCHAR uniFFE5
-ENCODING 65509
+STARTCHAR uniFFE6
+ENCODING 65510
 SWIDTH 1020 0
 DWIDTH 17 0
 BBX 14 12 1 -1
diff --git a/xorg-server/fonts.src/misc/olcursor.bdf b/xorg-server/fonts.src/misc/olcursor.bdf
index 340362a56..d4a20778d 100644
--- a/xorg-server/fonts.src/misc/olcursor.bdf
+++ b/xorg-server/fonts.src/misc/olcursor.bdf
@@ -1,26 +1,26 @@
 STARTFONT 2.1
 COMMENT $Xorg: olcursor.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $
 COMMENT  
-COMMENT  Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. 
-COMMENT  
-COMMENT  Permission to use, copy, modify, and distribute this software and 
-COMMENT  its documentation for any purpose and without fee is hereby granted, 
-COMMENT  provided that the above copyright notices appear in all copies and 
-COMMENT  that both those copyright notices and this permission notice appear 
-COMMENT  in supporting documentation, and that the name of Sun Microsystems 
-COMMENT  not be used in advertising or publicity pertaining to distribution 
-COMMENT  of the software without specific, written prior permission.  Sun 
-COMMENT  Microsystems make no representations about the suitability of this 
-COMMENT  software for any purpose.  It is provided "as is" without express or 
-COMMENT  implied warranty. 
-COMMENT  
-COMMENT  SUN MICROSYSTEMS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS 
-COMMENT  SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-COMMENT  FITNESS, IN NO EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY 
-COMMENT  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER 
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF 
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+COMMENT  Copyright (c) 1989, Oracle and/or its affiliates. All rights reserved.
+COMMENT
+COMMENT  Permission is hereby granted, free of charge, to any person obtaining a
+COMMENT  copy of this software and associated documentation files (the "Software"),
+COMMENT  to deal in the Software without restriction, including without limitation
+COMMENT  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+COMMENT  and/or sell copies of the Software, and to permit persons to whom the
+COMMENT  Software is furnished to do so, subject to the following conditions:
+COMMENT
+COMMENT  The above copyright notice and this permission notice (including the next
+COMMENT  paragraph) shall be included in all copies or substantial portions of the
+COMMENT  Software.
+COMMENT
+COMMENT  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+COMMENT  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+COMMENT  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+COMMENT  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+COMMENT  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+COMMENT  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+COMMENT  DEALINGS IN THE SOFTWARE.
 COMMENT  
 COMMENT  ** Open Look Cursor Font ** 
 FONT -Sun-OPEN LOOK cursor-----12-120-75-75-P-160-SunOLcursor-1
diff --git a/xorg-server/fonts.src/misc/olgl10.bdf b/xorg-server/fonts.src/misc/olgl10.bdf
index 050cd81f6..2415c5e50 100644
--- a/xorg-server/fonts.src/misc/olgl10.bdf
+++ b/xorg-server/fonts.src/misc/olgl10.bdf
@@ -1,26 +1,26 @@
 STARTFONT 2.1
 COMMENT $Xorg: olgl10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $
 COMMENT 
-COMMENT  Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA.
-COMMENT 
-COMMENT  Permission to use, copy, modify, and distribute this software and
-COMMENT  its documentation for any purpose and without fee is hereby granted,
-COMMENT  provided that the above copyright notices appear in all copies and
-COMMENT  that both those copyright notices and this permission notice appear
-COMMENT  in supporting documentation, and that the name of Sun Microsystems
-COMMENT  not be used in advertising or publicity pertaining to distribution
-COMMENT  of the software without specific, written prior permission.  Sun
-COMMENT  Microsystems make no representations about the suitability of this
-COMMENT  software for any purpose.  It is provided "as is" without express or
-COMMENT  implied warranty.
-COMMENT 
-COMMENT  SUN MICROSYSTEMS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-COMMENT  SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-COMMENT  FITNESS, IN NO EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY
-COMMENT  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+COMMENT  Copyright (c) 1989, Oracle and/or its affiliates. All rights reserved.
+COMMENT
+COMMENT  Permission is hereby granted, free of charge, to any person obtaining a
+COMMENT  copy of this software and associated documentation files (the "Software"),
+COMMENT  to deal in the Software without restriction, including without limitation
+COMMENT  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+COMMENT  and/or sell copies of the Software, and to permit persons to whom the
+COMMENT  Software is furnished to do so, subject to the following conditions:
+COMMENT
+COMMENT  The above copyright notice and this permission notice (including the next
+COMMENT  paragraph) shall be included in all copies or substantial portions of the
+COMMENT  Software.
+COMMENT
+COMMENT  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+COMMENT  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+COMMENT  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+COMMENT  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+COMMENT  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+COMMENT  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+COMMENT  DEALINGS IN THE SOFTWARE.
 COMMENT 
 COMMENT  ** Open Look Glyph Font, 10-pt **
 FONT -Sun-OPEN LOOK glyph-----10-100-75-75-P-101-SunOLglyph-1
diff --git a/xorg-server/fonts.src/misc/olgl12.bdf b/xorg-server/fonts.src/misc/olgl12.bdf
index 14508c0da..0828cdb6c 100644
--- a/xorg-server/fonts.src/misc/olgl12.bdf
+++ b/xorg-server/fonts.src/misc/olgl12.bdf
@@ -1,26 +1,26 @@
 STARTFONT 2.1
 COMMENT $Xorg: olgl12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $
 COMMENT 
-COMMENT  Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA.
-COMMENT 
-COMMENT  Permission to use, copy, modify, and distribute this software and
-COMMENT  its documentation for any purpose and without fee is hereby granted,
-COMMENT  provided that the above copyright notices appear in all copies and
-COMMENT  that both those copyright notices and this permission notice appear
-COMMENT  in supporting documentation, and that the name of Sun Microsystems
-COMMENT  not be used in advertising or publicity pertaining to distribution
-COMMENT  of the software without specific, written prior permission.  Sun
-COMMENT  Microsystems make no representations about the suitability of this
-COMMENT  software for any purpose.  It is provided "as is" without express or
-COMMENT  implied warranty.
-COMMENT 
-COMMENT  SUN MICROSYSTEMS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-COMMENT  SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-COMMENT  FITNESS, IN NO EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY
-COMMENT  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+COMMENT  Copyright (c) 1989, Oracle and/or its affiliates. All rights reserved.
+COMMENT
+COMMENT  Permission is hereby granted, free of charge, to any person obtaining a
+COMMENT  copy of this software and associated documentation files (the "Software"),
+COMMENT  to deal in the Software without restriction, including without limitation
+COMMENT  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+COMMENT  and/or sell copies of the Software, and to permit persons to whom the
+COMMENT  Software is furnished to do so, subject to the following conditions:
+COMMENT
+COMMENT  The above copyright notice and this permission notice (including the next
+COMMENT  paragraph) shall be included in all copies or substantial portions of the
+COMMENT  Software.
+COMMENT
+COMMENT  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+COMMENT  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+COMMENT  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+COMMENT  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+COMMENT  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+COMMENT  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+COMMENT  DEALINGS IN THE SOFTWARE.
 COMMENT 
 COMMENT  ** Open Look Glyph Font, 12-pt **
 FONT -Sun-OPEN LOOK glyph-----12-120-75-75-P-113-SunOLglyph-1
diff --git a/xorg-server/fonts.src/misc/olgl14.bdf b/xorg-server/fonts.src/misc/olgl14.bdf
index 9a0b85609..cf233d2e8 100644
--- a/xorg-server/fonts.src/misc/olgl14.bdf
+++ b/xorg-server/fonts.src/misc/olgl14.bdf
@@ -1,26 +1,26 @@
 STARTFONT 2.1
 COMMENT $Xorg: olgl14.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $
 COMMENT 
-COMMENT  Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA.
-COMMENT 
-COMMENT  Permission to use, copy, modify, and distribute this software and
-COMMENT  its documentation for any purpose and without fee is hereby granted,
-COMMENT  provided that the above copyright notices appear in all copies and
-COMMENT  that both those copyright notices and this permission notice appear
-COMMENT  in supporting documentation, and that the name of Sun Microsystems
-COMMENT  not be used in advertising or publicity pertaining to distribution
-COMMENT  of the software without specific, written prior permission.  Sun
-COMMENT  Microsystems make no representations about the suitability of this
-COMMENT  software for any purpose.  It is provided "as is" without express or
-COMMENT  implied warranty.
-COMMENT 
-COMMENT  SUN MICROSYSTEMS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-COMMENT  SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-COMMENT  FITNESS, IN NO EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY
-COMMENT  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+COMMENT  Copyright (c) 1989, Oracle and/or its affiliates. All rights reserved.
+COMMENT
+COMMENT  Permission is hereby granted, free of charge, to any person obtaining a
+COMMENT  copy of this software and associated documentation files (the "Software"),
+COMMENT  to deal in the Software without restriction, including without limitation
+COMMENT  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+COMMENT  and/or sell copies of the Software, and to permit persons to whom the
+COMMENT  Software is furnished to do so, subject to the following conditions:
+COMMENT
+COMMENT  The above copyright notice and this permission notice (including the next
+COMMENT  paragraph) shall be included in all copies or substantial portions of the
+COMMENT  Software.
+COMMENT
+COMMENT  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+COMMENT  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+COMMENT  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+COMMENT  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+COMMENT  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+COMMENT  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+COMMENT  DEALINGS IN THE SOFTWARE.
 COMMENT 
 COMMENT  ** Open Look Glyph Font, 14-pt **
 FONT -Sun-OPEN LOOK glyph-----14-140-75-75-P-128-SunOLglyph-1
diff --git a/xorg-server/fonts.src/misc/olgl19.bdf b/xorg-server/fonts.src/misc/olgl19.bdf
index 674107aea..ceb97e760 100644
--- a/xorg-server/fonts.src/misc/olgl19.bdf
+++ b/xorg-server/fonts.src/misc/olgl19.bdf
@@ -1,26 +1,26 @@
 STARTFONT 2.1
 COMMENT $Xorg: olgl19.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $
 COMMENT 
-COMMENT  Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA.
-COMMENT 
-COMMENT  Permission to use, copy, modify, and distribute this software and
-COMMENT  its documentation for any purpose and without fee is hereby granted,
-COMMENT  provided that the above copyright notices appear in all copies and
-COMMENT  that both those copyright notices and this permission notice appear
-COMMENT  in supporting documentation, and that the name of Sun Microsystems
-COMMENT  not be used in advertising or publicity pertaining to distribution
-COMMENT  of the software without specific, written prior permission.  Sun
-COMMENT  Microsystems make no representations about the suitability of this
-COMMENT  software for any purpose.  It is provided "as is" without express or
-COMMENT  implied warranty.
-COMMENT 
-COMMENT  SUN MICROSYSTEMS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-COMMENT  SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-COMMENT  FITNESS, IN NO EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY
-COMMENT  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+COMMENT  Copyright (c) 1989, Oracle and/or its affiliates. All rights reserved.
+COMMENT
+COMMENT  Permission is hereby granted, free of charge, to any person obtaining a
+COMMENT  copy of this software and associated documentation files (the "Software"),
+COMMENT  to deal in the Software without restriction, including without limitation
+COMMENT  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+COMMENT  and/or sell copies of the Software, and to permit persons to whom the
+COMMENT  Software is furnished to do so, subject to the following conditions:
+COMMENT
+COMMENT  The above copyright notice and this permission notice (including the next
+COMMENT  paragraph) shall be included in all copies or substantial portions of the
+COMMENT  Software.
+COMMENT
+COMMENT  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+COMMENT  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+COMMENT  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+COMMENT  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+COMMENT  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+COMMENT  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+COMMENT  DEALINGS IN THE SOFTWARE.
 COMMENT 
 COMMENT  ** Open Look Glyph Font, 19-pt **
 FONT -Sun-OPEN LOOK glyph-----19-190-75-75-P-154-SunOLglyph-1