Merge branch 'dev' into jl777

2018-04-17 23:28:32 +03:00
parent 9bcc632131 20f6a7273f
commit 7213e636c1
4 changed files with 301 additions and 300 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -528,8 +528,8 @@ wallet_utility_LDADD = \
 	$(CRYPTO_LIBS) \
 	$(LIBZCASH) \
 	$(LIBSNARK) \
-    $(LIBZCASH_LIBS)\
-  	$(LIBCRYPTOCONDITIONS)
+	$(LIBZCASH_LIBS)\
+  $(LIBCRYPTOCONDITIONS)
 endif

 # zcash-tx binary #