aboutsummaryrefslogtreecommitdiff
path: root/X11/xtrans/Xtranssock.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-26 21:23:55 +0000
committermarha <marha@users.sourceforge.net>2010-12-26 21:23:55 +0000
commit8f1afd266a69c5454dccf130e8522575c7aecae8 (patch)
treed647da44b8f803428e3217d54bd42d89e72fa803 /X11/xtrans/Xtranssock.c
parentcc5b4c212b7c88026e8ebc5f3d82473149a040c5 (diff)
parentf28d4c94798d88757227b8c517a05a6ca354dc6f (diff)
downloadvcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.gz
vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.bz2
vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.zip
svn merge ^/branches/released .
Diffstat (limited to 'X11/xtrans/Xtranssock.c')
-rw-r--r--X11/xtrans/Xtranssock.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/X11/xtrans/Xtranssock.c b/X11/xtrans/Xtranssock.c
index 6fc9479f5..a17c162e9 100644
--- a/X11/xtrans/Xtranssock.c
+++ b/X11/xtrans/Xtranssock.c
@@ -1,7 +1,28 @@
/*
+ * Copyright (c) 2002, 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 1993, 1994, 1998 The Open Group
-Copyright 2002 Sun Microsystems, Inc. All rights reserved.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that