diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-03-01 10:24:59 -0800 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-03-01 14:12:08 -0800 |
| commit | 20827807711933b0083458c968aa6bbc06db859f (patch) | |
| tree | 3cb6478afbaec3deaf59daf0bce341cdbbf267de /doc | |
| parent | 3e9e3232638a75e21f3ef2ca12888aaade8792f4 (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 'doc')
| -rw-r--r-- | doc/Makefile.am | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index f4f5fc0..18ed073 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,25 +1,27 @@ -## -## Makefile for the doc subdirectory of xorg-gtest -## -## Copyright (C) 2011 Canonical Ltd. -## -## Process this file with automake to produce Makefile.in. -## -## This file is part of the libgeis project. This library is free -## software; you can redistribute it and/or modify it under the -## terms of the GNU General Public License as published by the -## Free Software Foundation; either version 3, or (at your option) -## any later version. -## -## 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License along -## with this library; see the file COPYING3. If not see -## <http://www.gnu.org/licenses/>. -## +# +# Makefile for the doc subdirectory of xorg-gtest +# +# Copyright (C) 2011, 2012 Canonical, Ltd. +# +# 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. +# EXTRA_DIST = \ Doxyfile |