diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 11:47:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 11:48:38 +0200 |
| commit | b76a767906976f21520fff3a1bbee8698c9eb5e4 (patch) | |
| tree | 1bb462a9bc1ada51ab88516d756b3e0dfec41ff4 | |
| parent | 8d132431b4f6a7676482815231cd923d9047d541 (diff) | |
| parent | e2efdf3937e71c0ae91b7a1e5d381d04bc814bb6 (diff) | |
Merge pull request #5031
e2efdf3 amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
| -rw-r--r-- | src/amount.h | 4 | ||||
| -rw-r--r-- | src/util.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/amount.h b/src/amount.h index 42006a0388..831fa1f6ca 100644 --- a/src/amount.h +++ b/src/amount.h @@ -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 diff --git a/src/util.h b/src/util.h index fb1d3eacb5..4b2415278b 100644 --- a/src/util.h +++ b/src/util.h @@ -14,7 +14,6 @@ #include "config/bitcoin-config.h" #endif -#include "amount.h" #include "compat.h" #include "tinyformat.h" #include "utiltime.h" |