Merge pull request #5031

e2efdf3 amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-10-02 11:47:18 +02:00
commit b76a767906
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 2 additions and 3 deletions

View File

@ -1,6 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_AMOUNT_H
@ -10,4 +10,4 @@
typedef int64_t CAmount;
#endif
#endif // BITCOIN_AMOUNT_H

View File

@ -14,7 +14,6 @@
#include "config/bitcoin-config.h"
#endif
#include "amount.h"
#include "compat.h"
#include "tinyformat.h"
#include "utiltime.h"