Permalink
Browse files

Merge pull request #2 from mkoch/master

updated license compliance for our derivative works from our own gamplay
  • Loading branch information...
rmadhavan committed Jul 24, 2012
2 parents c073a36 + cfe1df5 commit 3c684fae20f2fa03f7e96a778f69709144fc487d
Showing with 25 additions and 3 deletions.
  1. +21 −2 HelloOggVorbis/LICENSE
  2. +4 −1 HelloOggVorbis/Notice
View
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -233,4 +232,24 @@ 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.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------
+
+This software (in particular soundmanager.cpp) includes gameplay
+From http://www.gameplay3d.org/
+Licensed as follows:
+
+ Copyright 2011-2012 Research In Motion Limited.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
View
@@ -5,4 +5,7 @@ This product includes software developed at
Research In Motion Limited (http://www.rim.com/).
This software includes libogg and libvorbis from http://xiph.org
-Copyright (c) 2002, Xiph.org Foundation
+Copyright (c) 2002, Xiph.org Foundation
+
+This software includes gameplay From http://www.gameplay3d.org/
+Copyright 2011-2012 Research In Motion Limited.

0 comments on commit 3c684fa

Please sign in to comment.