Skip to content

Commit

Permalink
add top-level LICENSE file
Browse files Browse the repository at this point in the history
  • Loading branch information
lhoward committed Feb 5, 2013
1 parent f332027 commit c4b4ef7
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 32 deletions.
69 changes: 69 additions & 0 deletions LICENSE
@@ -0,0 +1,69 @@
/*
* Copyright (c) 2013 PADL Software Pty Ltd.
* 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. Redistributions in any form must be accompanied by information on
* how to obtain complete source code for the gss_browserid software
* and any accompanying software that uses the gss_browserid software.
* The source code must either be included in the distribution or be
* available for no more than the cost of distribution plus a nominal
* fee, and must be freely redistributable under reasonable conditions.
* For an executable file, complete source code means the source code
* for all modules it contains. It does not include source code for
* modules or files that typically accompany the major components of
* the operating system on which the executable file runs.
*
* THIS SOFTWARE IS PROVIDED BY PADL SOFTWARE ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
* NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL PADL SOFTWARE
* 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.
*/
/*
* Copyright (c) 2011, JANET(UK)
* 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 JANET(UK) 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 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 COPYRIGHT HOLDER 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.
*/
31 changes: 0 additions & 31 deletions mech_browserid/LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion mech_browserid/Makefile.am
Expand Up @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign


EXTRA_DIST = gssbrowserid_err.et libbrowserid_err.et \ EXTRA_DIST = gssbrowserid_err.et libbrowserid_err.et \
mech_browserid.exports mech_browserid-noacceptor.exports \ mech_browserid.exports mech_browserid-noacceptor.exports \
LICENSE AUTHORS AUTHORS


if GSSBID_BUILD_MECH if GSSBID_BUILD_MECH


Expand Down

0 comments on commit c4b4ef7

Please sign in to comment.