diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-03-05 22:25:49 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-03-05 22:25:49 +0000 |
| commit | 26029868758949697c2cf7c4a21a88eea3c2a7d5 (patch) | |
| tree | 1861c3ccf96e16184941a78f58d4952ebecb6d5a /indra/newview/licenses-linux.txt | |
| parent | 1d18eb043ab71998bded6931e181e53cbb9bf386 (diff) | |
merge -r58599:58732 branches/im-email-base32 to release
Diffstat (limited to 'indra/newview/licenses-linux.txt')
| -rw-r--r-- | indra/newview/licenses-linux.txt | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/indra/newview/licenses-linux.txt b/indra/newview/licenses-linux.txt index 57df413ae0..20b76c8bc7 100644 --- a/indra/newview/licenses-linux.txt +++ b/indra/newview/licenses-linux.txt @@ -16,6 +16,38 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +============== +Base32 License +============== + + * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de> + * 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. Neither the name of the authors 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 AUTHORS 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. + ========== Cg License ========== |