diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-04-24 21:39:22 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-04-24 21:39:22 +0400 |
| commit | ab5a0497056a4095a1bfe40e4dbebb12d7c503f2 (patch) | |
| tree | a8af08599463592e886fe964c51586794210392b /include/opus_multistream.h | |
| parent | 64e8021c2fc7bb8faf697750778a5e267663040b (diff) | |
| parent | 390c89225d6eb3cbd974a9d3f9eb3f6b723fbeb3 (diff) | |
Merge commit '390c89225d'
Diffstat (limited to 'include/opus_multistream.h')
| -rw-r--r-- | include/opus_multistream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/opus_multistream.h b/include/opus_multistream.h index 49b7f811..24c524e0 100644 --- a/include/opus_multistream.h +++ b/include/opus_multistream.h @@ -15,8 +15,8 @@ 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 |