summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2010-01-14 22:46:10 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2010-01-14 22:46:10 -0800
commitbd94930d9082095886f469965264dc352f0bbbb2 (patch)
tree9ce942cc0cdd82d93375f09231a6c98838f5b93f
parent5bed941fa0064823bfbe21c37729df02a5aa9b97 (diff)
downloadxkbutils-bd94930d9082095886f469965264dc352f0bbbb2.tar.gz
xkbutils-bd94930d9082095886f469965264dc352f0bbbb2.tar.bz2
xkbutils-bd94930d9082095886f469965264dc352f0bbbb2.zip
Add missing notices to COPYING file
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--COPYING22
1 files changed, 21 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 7af88a8..8eae4fc 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
+Copyright (c) 1993, 1995 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
@@ -21,3 +21,23 @@ 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.
+Copyright 2008 Sun Microsystems, Inc. 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.