diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-12 08:00:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-12 08:00:50 +0000 |
| commit | d5e29dcea2cc608ff063dc701262a5c065f61211 (patch) | |
| tree | 5ebae54f218f71c6cd0683a7450cf2bdf8863814 /xorg-server/fonts.src/misc/olgl12.bdf | |
| parent | 4d66284976afa1ededd651407c5b3e6bf1a26cec (diff) | |
| parent | 15e71293287f0dd3854751d36d4e74d643c84c08 (diff) | |
| download | vcxsrv-d5e29dcea2cc608ff063dc701262a5c065f61211.tar.gz vcxsrv-d5e29dcea2cc608ff063dc701262a5c065f61211.tar.bz2 vcxsrv-d5e29dcea2cc608ff063dc701262a5c065f61211.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/misc/olgl12.bdf')
| -rw-r--r-- | xorg-server/fonts.src/misc/olgl12.bdf | 40 |
1 files changed, 20 insertions, 20 deletions
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 |