aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/tx_extra.h
diff options
context:
space:
mode:
authorNeozaru <neozaru@mailoo.org>2014-06-01 18:21:30 +0200
committerNeozaru <neozaru@mailoo.org>2014-06-01 18:21:30 +0200
commit8530629e22d88de4c2fd4d7d231b00c65d30100d (patch)
tree0890c9ee74331cd1f27093833718d3cf7eb20d26 /src/cryptonote_core/tx_extra.h
parentsimplewallet returns 0 when no error (diff)
parentMerge branch '0.8.8update' (diff)
downloadmonero-8530629e22d88de4c2fd4d7d231b00c65d30100d.tar.xz
Merge bitmonero@monero-project
Diffstat (limited to 'src/cryptonote_core/tx_extra.h')
-rw-r--r--src/cryptonote_core/tx_extra.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_extra.h b/src/cryptonote_core/tx_extra.h
index 254a6a2ff..37a04a41e 100644
--- a/src/cryptonote_core/tx_extra.h
+++ b/src/cryptonote_core/tx_extra.h
@@ -135,7 +135,6 @@ namespace cryptonote
// varint tag;
// varint size;
// varint data[];
- //typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce> tx_extra_field;
typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce, tx_extra_merge_mining_tag> tx_extra_field;
}