summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2019-02-24 12:58:27 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2019-02-24 13:02:08 +0100
commit400e7a39035d5f78bee2d6d83223cbdfbd61e24c (patch)
treee5dc5190a7ca1130179aa16d063bab14d5215333 /LICENSE
parentfbab3ad214acc8213e60a892c979d4eb107abb23 (diff)
downloadslixmpp-400e7a39035d5f78bee2d6d83223cbdfbd61e24c.tar.gz
slixmpp-400e7a39035d5f78bee2d6d83223cbdfbd61e24c.tar.bz2
slixmpp-400e7a39035d5f78bee2d6d83223cbdfbd61e24c.tar.xz
slixmpp-400e7a39035d5f78bee2d6d83223cbdfbd61e24c.zip
Remove SocksiPy license
I wrote a SOCKS5 implementation back in 9c5dd024b190e69583d06fae07db50896a41b454, and removed SocksiPy from slixmpp’s codebase at the same time.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE25
1 files changed, 0 insertions, 25 deletions
diff --git a/LICENSE b/LICENSE
index 4e79cc5c..d281a92b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -138,28 +138,3 @@ 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.
-
-socksipy: A Python SOCKS client module.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright 2006 Dan-Haim. 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 Dan Haim nor the names of his contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY DAN HAIM "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 DAN HAIM OR HIS 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, 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 DAMANGE.