Skip to content

Commit

Permalink
Merge pull request blackberry#61 from rwallace2/master
Browse files Browse the repository at this point in the history
Updating the License file for Urban Airship and Removing unnecessary files.
  • Loading branch information
pelegri committed Dec 7, 2012
2 parents 0983f6d + 0b631d2 commit 13b23ad
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 491 deletions.
53 changes: 0 additions & 53 deletions UrbanAirshipClient/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -200,56 +200,3 @@
See the License for the specific language governing permissions and
limitations under the License.

--------------------------------------------------

This software includes libogg and libvorbis from http://xiph.org
Licensed as follows:

Copyright (c) 2002, Xiph.org Foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

- 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.

- Neither the name of the Xiph.org Foundation 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 FOUNDATION
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.

--------------------------------------------------

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.
73 changes: 0 additions & 73 deletions UrbanAirshipClient/assets/.preview-2521576766689695840qml~

This file was deleted.

108 changes: 0 additions & 108 deletions UrbanAirshipClient/assets/.preview-2894945474626108722qml~

This file was deleted.

29 changes: 0 additions & 29 deletions UrbanAirshipClient/assets/.preview-3458196180992535369qml~

This file was deleted.

27 changes: 0 additions & 27 deletions UrbanAirshipClient/assets/.preview-3489820874988455926qml~

This file was deleted.

100 changes: 0 additions & 100 deletions UrbanAirshipClient/assets/.preview-3716184625250058089qml~

This file was deleted.

Loading

0 comments on commit 13b23ad

Please sign in to comment.