diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
| commit | 439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (patch) | |
| tree | 793fbb8e2a3630ba56a145f784cbe134800316e7 /libX11/man/XAddHost.man | |
| parent | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (diff) | |
| parent | a9768b035f2c47be0908520474073cc68d225d8a (diff) | |
| download | vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.gz vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.bz2 vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/man/XAddHost.man')
| -rw-r--r-- | libX11/man/XAddHost.man | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/libX11/man/XAddHost.man b/libX11/man/XAddHost.man index fd6541dcf..8032d6c25 100644 --- a/libX11/man/XAddHost.man +++ b/libX11/man/XAddHost.man @@ -1,5 +1,4 @@ .\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium -.\" Copyright \(co 2004 Sun Microsystems, Inc. .\" .\" All rights reserved. .\" @@ -30,6 +29,27 @@ .\" .\" X Window System is a trademark of The Open Group. .\" +.\" Copyright 2004 Sun Microsystems, Inc. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. +.\" .\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by .\" Digital Equipment Corporation .\" @@ -46,8 +66,6 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.3 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.2 2004-04-23 18:42:09 eich Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface |