aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/LICENSE.txt
diff options
context:
space:
mode:
authorfluffypony <ric@spagni.net>2014-07-25 18:29:08 +0200
committerfluffypony <ric@spagni.net>2014-07-25 18:29:08 +0200
commit32f9d2b78316efe114193d720b1aa8a8c3d04b2e (patch)
tree8ac51f9f6308f79a7621c9bc3811a4e61941c81d /contrib/epee/LICENSE.txt
parentMerge pull request #71 from Jojatekok/master (diff)
downloadmonero-32f9d2b78316efe114193d720b1aa8a8c3d04b2e.tar.xz
move modified epee code to new classes, revert license
Diffstat (limited to 'contrib/epee/LICENSE.txt')
-rw-r--r--contrib/epee/LICENSE.txt32
1 files changed, 0 insertions, 32 deletions
diff --git a/contrib/epee/LICENSE.txt b/contrib/epee/LICENSE.txt
index 77584dd0d..4a6b529e5 100644
--- a/contrib/epee/LICENSE.txt
+++ b/contrib/epee/LICENSE.txt
@@ -1,35 +1,3 @@
-Copyright (c) 2014, The Monero Project
-
-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 the copyright holder 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.
-
-
-Parts of this project are originally copyright (c) 2006-2013, Andrey N. Sabelnikov
-As such, included below is the original license as it appeared:
-
Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
All rights reserved.