diff options
| author | MaZderMind <git@mazdermind.de> | 2016-04-28 13:12:54 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-04-28 13:12:54 +0200 |
| commit | 384a9474052fb17f9ca8afad330024d7232c7943 (patch) | |
| tree | fb9d6abf3e869b1942ab11baaf80b8f5cddf6d91 | |
| parent | 77109a00a416323e0042a70146785c356ee02643 (diff) | |
| parent | 59b3a3ea990c170027b73d1ff7035de23afa810a (diff) | |
Merge branch 'cleanup-license'0.3.1
| -rw-r--r-- | LICENSE.txt | 2 | ||||
| -rw-r--r-- | voctogui/COPYING | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 44ff5d4..c0950d8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2015 C3Voc <voc@c3voc.de> +Copyright (c) 2014-2016 c3voc <voc@c3voc.de> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/voctogui/COPYING b/voctogui/COPYING deleted file mode 100644 index 29dbada..0000000 --- a/voctogui/COPYING +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (C) 2014 Peter Körner <peter@mazdermind.de>> -The Regents of the University of California. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -All advertising materials mentioning features or use of this software must display the following acknowledgement: “This product includes software developed by the University of California, Berkeley and its contributors.” -Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |