aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormydesktop <dev.mc2@gmail.com>2014-04-30 16:55:49 -0400
committermydesktop <dev.mc2@gmail.com>2014-04-30 16:55:49 -0400
commit0f42b2eba685f697b7c4a1040d1f1560fc5748da (patch)
treed40b85970fe1b1dfd05c6cfdad2b3c87e8befef4
parentmac osx building fixes (diff)
parentReverting wallet2.cpp to proper bugfix (diff)
downloadmonero-0f42b2eba685f697b7c4a1040d1f1560fc5748da.tar.xz
Merge branch 'master' of github.com:monero-project/bitmonero
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet2.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index ca16025bf..9bd487997 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -41,7 +41,6 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_
// Temporarily disabled due to messed up tx_extra from someone
// screwing around with MMing. 2014-04-30
-
// THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx);
// We don't know how to handle this weird tx, so return