Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoin

2015-12-02 12:28:14 +01:00
parent 1b0241fcec 982709199f
commit fad4ea836d
16 changed files with 205 additions and 83 deletions
--- a/src/univalue/.gitignore
+++ b/src/univalue/.gitignore
@@ -18,6 +18,7 @@ univalue-config.h*
 test-driver
 libtool
 ltmain.sh
+test-suite.log

 *.a
 *.la