diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:28:17 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:28:17 +0200 |
| commit | c63e9633b556c5f3c5b1467bbae8ac376abeb4e9 (patch) | |
| tree | 27d889e2b8306eb9eae6ea1c3784d9e4d9b6022d /src/simplewallet/simplewallet.h | |
| parent | Merge pull request #2194 (diff) | |
| parent | Fix handling of strings & simplify summation of spendkeys (diff) | |
| download | monero-c63e9633b556c5f3c5b1467bbae8ac376abeb4e9.tar.xz | |
Merge pull request #2218
02f13d6c Fix handling of strings & simplify summation of spendkeys (JollyMort)
40fc9d7b Add option to join multisig wallet pieces together (JollyMort)
Diffstat (limited to 'src/simplewallet/simplewallet.h')
| -rw-r--r-- | src/simplewallet/simplewallet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index e04352295..b73c6a941 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -264,6 +264,7 @@ namespace cryptonote std::string m_generate_new; std::string m_generate_from_view_key; std::string m_generate_from_keys; + std::string m_generate_from_multisig_keys; std::string m_generate_from_json; std::string m_import_path; |