diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-06 04:42:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-06 04:42:09 +0200 |
| commit | 5505a1b13f75af9f0f6421b42d97c06e079db345 (patch) | |
| tree | 056dea4e6ff864c27465110157540d466e934176 /src/main.h | |
| parent | 5f1aee066a56aa5ac980758d5d3a69dd37a46e73 (diff) | |
| parent | eb6b3b245cab5bb172ba27a0072edf9c2de32c29 (diff) | |
| download | bitcoin-5505a1b13f75af9f0f6421b42d97c06e079db345.tar.xz | |
Merge pull request #5036
eb6b3b2 Update English translation (Wladimir J. van der Laan)
b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index c09a139b24..cad7eebfb7 100644 --- a/src/main.h +++ b/src/main.h @@ -178,7 +178,7 @@ CAmount GetBlockValue(int nHeight, const CAmount& nFees); /** Create a new block index entry for a given block hash */ CBlockIndex * InsertBlockIndex(uint256 hash); /** Abort with a message */ -bool AbortNode(const std::string &msg); +bool AbortNode(const std::string &msg, const std::string &userMessage=""); /** Get statistics from node state */ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats); /** Increase a node's misbehavior score. */ |