summaryrefslogtreecommitdiff
path: root/damageproto/COPYING
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-13 14:55:57 -0700
committerKeith Packard <keithp@keithp.com>2010-04-13 14:55:57 -0700
commit7068a11b2b1cfd4fc420e1527f46bf993308e48a (patch)
treecf13bee93585a801a97c76eab6783a8f82e0d19e /damageproto/COPYING
parent1ba45a2dc8b08b4d98d4af21e3ab41dec205e974 (diff)
Merge */COPYING into COPYING.HEADmaster
This takes all of the COPYING files and merges their contents together. In cases where the contents exactly matched the current canonical copyright form, they were removed entirely. All of the copyright holder names were sorted into a single list at the top. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'damageproto/COPYING')
-rw-r--r--damageproto/COPYING23
1 files changed, 0 insertions, 23 deletions
diff --git a/damageproto/COPYING b/damageproto/COPYING
deleted file mode 100644
index a44e065..0000000
--- a/damageproto/COPYING
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id: COPYING,v 1.1 2003-10-24 06:16:46 keithp Exp $
-
-Copyright © 2001,2003 Keith Packard
-Copyright © 2007 Eric Anholt
-
-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 Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Keith Packard makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD 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.
-