diff options
author | Stefan Hacker <dd0t@users.sourceforge.net> | 2011-12-11 17:10:40 +0400 |
---|---|---|
committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2011-12-11 17:11:26 +0400 |
commit | a45a4dd92cb6ce6cca32d80e39bf69ad3facef74 (patch) | |
tree | ace2e73bf65e2460ff73d20bed00eef6fa75d948 /3rdPartyLicenses | |
parent | 31bb25e65f2171fd8fde0746bbb7d18634ed963f (diff) |
License work
- Added "3rd party licenses" tab to about box containing licenses for speex, celt, openssl and libsndfile
- Removed speex about box.
- Removed creation of program menu links to qt/speex license from installer
- Adjusted mklic.pl to generate the necessary constants in licenses.h
Diffstat (limited to '3rdPartyLicenses')
-rw-r--r-- | 3rdPartyLicenses/libsndfile_license.txt | 15 | ||||
-rw-r--r-- | 3rdPartyLicenses/openssl_license.txt | 51 |
2 files changed, 66 insertions, 0 deletions
diff --git a/3rdPartyLicenses/libsndfile_license.txt b/3rdPartyLicenses/libsndfile_license.txt new file mode 100644 index 000000000..d7174d571 --- /dev/null +++ b/3rdPartyLicenses/libsndfile_license.txt @@ -0,0 +1,15 @@ +Copyright (C) 1999-2011Erik de Castro Lopo <erikd@mega-nerd.com> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program 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 Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/3rdPartyLicenses/openssl_license.txt b/3rdPartyLicenses/openssl_license.txt new file mode 100644 index 000000000..51937945c --- /dev/null +++ b/3rdPartyLicenses/openssl_license.txt @@ -0,0 +1,51 @@ +==================================================================== +Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. 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. + +3. All advertising materials mentioning features or use of this + software must display the following acknowledgment: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + +4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + endorse or promote products derived from this software without + prior written permission. For written permission, please contact + openssl-core@openssl.org. + +5. Products derived from this software may not be called "OpenSSL" + nor may "OpenSSL" appear in their names without prior written + permission of the OpenSSL Project. + +6. Redistributions of any form whatsoever must retain the following + acknowledgment: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit (http://www.openssl.org/)" + +THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +EXPRESSED 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 OpenSSL PROJECT OR +ITS 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. +==================================================================== + +This product includes cryptographic software written by Eric Young +(eay@cryptsoft.com). This product includes software written by Tim +Hudson (tjh@cryptsoft.com). |