aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/LICENSE.txt
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2014-07-23 18:26:06 +0200
committerRiccardo Spagni <ric@spagni.net>2014-07-23 18:26:06 +0200
commit0a87cb0b33ac610e2347f5bcca74e9d03d384a67 (patch)
treeb5ef6408e601a9a45f192433ac682900c16f71fb /contrib/epee/LICENSE.txt
parentMerge pull request #69 from ekimmo/monero/master (diff)
parentLicense updated to BSD 3-clause (diff)
downloadmonero-0a87cb0b33ac610e2347f5bcca74e9d03d384a67.tar.xz
Merge pull request #70 from fluffypony/master
New readme, license changes
Diffstat (limited to 'contrib/epee/LICENSE.txt')
-rw-r--r--contrib/epee/LICENSE.txt32
1 files changed, 32 insertions, 0 deletions
diff --git a/contrib/epee/LICENSE.txt b/contrib/epee/LICENSE.txt
index 4a6b529e5..77584dd0d 100644
--- a/contrib/epee/LICENSE.txt
+++ b/contrib/epee/LICENSE.txt
@@ -1,3 +1,35 @@
+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.