diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-04-24 13:39:22 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-04-24 13:39:22 -0400 |
commit | ab5a0497056a4095a1bfe40e4dbebb12d7c503f2 (patch) | |
tree | a8af08599463592e886fe964c51586794210392b /COPYING | |
parent | 64e8021c2fc7bb8faf697750778a5e267663040b (diff) | |
parent | 390c89225d6eb3cbd974a9d3f9eb3f6b723fbeb3 (diff) | |
download | opus-ab5a0497056a4095a1bfe40e4dbebb12d7c503f2.tar.gz |
Merge commit '390c89225d'
Diffstat (limited to 'COPYING')
-rw-r--r-- | COPYING | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -14,11 +14,16 @@ notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +- Neither the name of Internet Society, IETF or IETF Trust, nor the +names of specific contributors, may be used to endorse or promote +products derived from this software without specific prior written +permission. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 FOUNDATION OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +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 |