Skip to content

Commit c71a03f

Browse files
committed
And added the license text itself.
git-svn-id: https://mary.opendfki.de/repos/trunk@1711 953a6561-930b-0410-b2a6-db37d1b2ae63
1 parent 82d4f29 commit c71a03f

File tree

3 files changed

+855
-34
lines changed

3 files changed

+855
-34
lines changed

Diff for: MARY_software_user_agreement.txt

+14-34
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,21 @@
11
MARY Software User Agreement
2-
14 February 2006
2+
23 January 2009
33

44
MARY is licensed under the following terms.
55

6-
Copyright 2000-2006 DFKI GmbH.
7-
All Rights Reserved. Use is subject to license terms.
8-
9-
Permission is hereby granted, free of charge, to use and distribute
10-
this software and its documentation without restriction, including
11-
without limitation the rights to use, copy, modify, merge, publish,
12-
distribute, sublicense, and/or sell copies of this work, and to
13-
permit persons to whom this work is furnished to do so, subject to
14-
the following conditions:
15-
16-
1. The code must retain the above copyright notice, this list of
17-
conditions and the following disclaimer.
18-
2. Any modifications must be clearly marked as such.
19-
3. Original authors' names are not deleted.
20-
4. The authors' names are not used to endorse or promote products
21-
derived from this software without specific prior written
22-
permission.
23-
24-
DFKI GMBH AND THE CONTRIBUTORS TO THIS WORK DISCLAIM ALL WARRANTIES WITH
25-
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
26-
MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DFKI GMBH NOR THE
27-
CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
28-
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
29-
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
30-
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
31-
THIS SOFTWARE.
32-
33-
Scientific publications using MARY are requested to cite the MARY reference
34-
paper in their bibliography:
35-
36-
Schröder, M. & Trouvain, J. (2003). The German Text-to-Speech Synthesis
37-
System MARY: A Tool for Research, Development and Teaching.
38-
International Journal of Speech Technology, 6, pp. 365-377.
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU Lesser General Public License as published by
8+
the Free Software Foundation, version 3 of the License.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
18+
3919

4020

4121
Applicable Licenses

0 commit comments

Comments
 (0)