Merge remote-tracking branch 'zcash/master' into dPoW

2016-10-17 15:28:00 -03:00
parent 9e211e057f 6a7acc29a1
commit 3a672e7b11
205 changed files with 4205 additions and 2995 deletions
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -478,7 +478,6 @@ const boost::filesystem::path &ZC_GetParamsDir()
        return path;

    path = ZC_GetBaseParamsDir();
-    path /= BaseParams().DataDir();

    return path;
 }