aboutsummaryrefslogtreecommitdiff
path: root/apps/xwininfo/COPYING
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-05 10:44:08 +0000
committermarha <marha@users.sourceforge.net>2010-10-05 10:44:08 +0000
commitbfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch)
tree37c4a2982fb317254b1ea14dd06c355f9da7826a /apps/xwininfo/COPYING
parentfe234aa555e2b16ac7836fee297878a6e3efe343 (diff)
parent51f3d1e140307561f64c47dae1d44f912accb5cf (diff)
downloadvcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz
vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2
vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip
svn merge ^/branches/released .
Diffstat (limited to 'apps/xwininfo/COPYING')
-rw-r--r--apps/xwininfo/COPYING23
1 files changed, 22 insertions, 1 deletions
diff --git a/apps/xwininfo/COPYING b/apps/xwininfo/COPYING
index e5c45f609..687540f0a 100644
--- a/apps/xwininfo/COPYING
+++ b/apps/xwininfo/COPYING
@@ -1,5 +1,26 @@
+Copyright (c) 1999, 2010, Oracle and/or its affiliates. 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 1987, 1993, 1998 The Open Group
-Copyright 1999 Sun Microsystems, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that