summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-03-01 10:24:59 -0800
committerChase Douglas <chase.douglas@canonical.com>2012-03-01 14:12:08 -0800
commit20827807711933b0083458c968aa6bbc06db859f (patch)
tree3cb6478afbaec3deaf59daf0bce341cdbbf267de /examples
parent3e9e3232638a75e21f3ef2ca12888aaade8792f4 (diff)
Relicense under the X.org preferred license
Copied from http://www.x.org/releases/X11R7.6/doc/xorg-docs/License.html Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.am28
1 files changed, 17 insertions, 11 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7076623..b311687 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,20 +2,26 @@
# @file examples/Makefile.am
# @brief automake recipe for the xorg-gtest examples
#
-# Copyright 2011 Canonical, Ltd.
+# Copyright (C) 2011, 2012 Canonical, Ltd.
#
-# This file is part of the utouch-geis library. This library is free software;
-# you can redistribute it and/or modify it under the terms of the GNU Lesser
-# General Public License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
+# 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:
#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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.
#
noinst_PROGRAMS = xorg-gtest-example