aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2015-06-10 10:58:50 -0700
committerBryce Harrington <bryce@osg.samsung.com>2015-06-12 15:51:38 -0700
commit541b0cf24effa2705e9ea8ae2f3d89272c27bb89 (patch)
tree8a90fe052c55d432d09e25fff232746bc0130916
parentwayland-server: Fix style on multi-line comment (diff)
downloadwayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar.gz
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar.bz2
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar.lz
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar.xz
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.tar.zst
wayland-541b0cf24effa2705e9ea8ae2f3d89272c27bb89.zip
protocol: Update boilerplate from MIT X11 license to MIT Expat license
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--protocol/wayland.xml38
1 files changed, 19 insertions, 19 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index f52677f..42c9309 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -6,26 +6,26 @@
Copyright © 2010-2011 Intel Corporation
Copyright © 2012-2013 Collabora, Ltd.
- Permission to use, copy, modify, distribute, and sell this
- software and its documentation for any purpose is hereby granted
- without fee, provided that the above copyright notice appear in
- all copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- the copyright holders not be used in advertising or publicity
- pertaining to distribution of the software without specific,
- written prior permission. The copyright holders make no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
+ 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 COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE 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.
+ 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>
<interface name="wl_display" version="1">