Merge.

[irc/quakenet/qwebirc.git] / LICENCE

diff --git a/LICENCE b/LICENCE
index 00a5e9f0489572a7b6fcd9f30e62bcfa2c348653..62e7452f63aa63664cb91933ab55145388b1146b 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -118,3 +118,24 @@ Use an excerpt from the webpage if necessary (don't copy the full article and di
 You Can Not:
 You can NOT sell the resources directly for profit (eg. Selling the items on stock resource websites)
 You can NOT copy the full webpage and display it on your own website. (Use an excerpt by all means, but please link to the original resource download page - not the actual file.)
+
+web-socket-js
+-------------
+
+https://github.com/gimite/web-socket-js/
+
+Copyright (c) 2013, Hiroshi Ichikawa
+All rights reserved.
+
+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 Hiroshi Ichikawa 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.
+
+SWFObject
+---------
+
+SWFObject v2.2 <http://code.google.com/p/swfobject/> is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>.
+