diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-18 14:01:30 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-18 14:01:30 +0000 |
| commit | d792a6e870288fd8f0baf9943caf1628224b764c (patch) | |
| tree | 84a7d544c1df15dffe7e18bf9cf0884250b831fc /X11 | |
| parent | ed47063ec4933a51ef0f2f7d667b8178a86b6b12 (diff) | |
| parent | 1bee0ef6e6bd055ba9083c1b3863549b8a9093cc (diff) | |
| download | vcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.tar.gz vcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.tar.bz2 vcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.zip | |
svn merge "^/branches/released" .1.7.99.902
increased version number
Diffstat (limited to 'X11')
| -rw-r--r-- | X11/ThreadsI.h | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/X11/ThreadsI.h b/X11/ThreadsI.h index f07fe290f..b1c51e73f 100644 --- a/X11/ThreadsI.h +++ b/X11/ThreadsI.h @@ -1,30 +1,27 @@ /* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ /************************************************************ -Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright no- -tice appear in all copies and that both that copyright no- -tice and this permission notice appear in supporting docu- -mentation, and that the name Sun not be used in advertising -or publicity pertaining to distribution of the software -without specific prior written permission. Sun makes no -representations about the suitability of this software for -any purpose. It is provided "as is" without any express or -implied warranty. - -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- -ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH -THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Copyright 1993 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. ********************************************************/ |