diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-07-23 18:26:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-07-23 18:26:06 +0200 |
| commit | 0a87cb0b33ac610e2347f5bcca74e9d03d384a67 (patch) | |
| tree | b5ef6408e601a9a45f192433ac682900c16f71fb /src/common/util.h | |
| parent | Merge pull request #69 from ekimmo/monero/master (diff) | |
| parent | License updated to BSD 3-clause (diff) | |
| download | monero-0a87cb0b33ac610e2347f5bcca74e9d03d384a67.tar.xz | |
Merge pull request #70 from fluffypony/master
New readme, license changes
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/src/common/util.h b/src/common/util.h index 8a1f4b041..92ce7177a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -1,6 +1,32 @@ -// Copyright (c) 2012-2013 The Cryptonote developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. +// 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 file are originally copyright (c) 2012-2013 The Cryptonote developers #pragma once |