Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into client_ref

This commit is contained in:
Marek Kotewicz 2015-07-16 10:21:48 +02:00
commit d22bb9acc5
2 changed files with 3 additions and 1 deletions

View File

@ -767,6 +767,8 @@ Options::Options()
wallet = true;
else if (arg == "--nonetwork")
nonetwork = true;
else if (arg == "--network")
nonetwork = false;
else if (arg == "--nodag")
nodag = true;
else if (arg == "--all")

View File

@ -224,7 +224,7 @@ public:
bool inputLimits = false;
bool bigData = false;
bool wallet = false;
bool nonetwork = false;
bool nonetwork = true;
bool nodag = true;
/// @}