Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5423 

8f1fe45 simplewallet: fix merge error with new welcome command (moneromooo-monero)
This commit is contained in:
luigi1111 2019-04-12 18:28:53 -04:00
parent 9c77dbf376 8f1fe45fe1
commit 37345921ec
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/simplewallet/simplewallet.cpp
View File

@ -3189,10 +3189,11 @@ simple_wallet::simple_wallet()
m_cmd_binder.set_handler("net_stats", m_cmd_binder.set_handler("net_stats",
boost::bind(&simple_wallet::net_stats, this, _1), boost::bind(&simple_wallet::net_stats, this, _1),
tr(USAGE_NET_STATS), tr(USAGE_NET_STATS),
tr("Prints simple network stats"));
m_cmd_binder.set_handler("welcome", m_cmd_binder.set_handler("welcome",
boost::bind(&simple_wallet::welcome, this, _1), boost::bind(&simple_wallet::welcome, this, _1),
tr(USAGE_WELCOME), tr(USAGE_WELCOME),
tr("Prints simple network stats")); tr("Prints basic info about Monero for first time users"));
m_cmd_binder.set_handler("version", m_cmd_binder.set_handler("version",
boost::bind(&simple_wallet::version, this, _1), boost::bind(&simple_wallet::version, this, _1),
tr(USAGE_VERSION), tr(USAGE_VERSION),