Merge branch 'dev' into devmerge

# Conflicts: # src/init.cpp # src/komodo_bitcoind.h # src/komodo_events.h # src/komodo_notary.h # src/komodo_structs.h # src/main.cpp # src/pow.cpp # src/rpcblockchain.cpp
2018-04-16 08:28:20 +03:00
parent f64557f7e0 9dd93da474
commit 7b136bcd74
5 changed files with 24 additions and 12 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,10 +105,10 @@ TESTS =
 #endif

 if BUILD_BITCOIN_UTILS
-	bin_PROGRAMS += komodo-cli komodo-tx
-	if ENABLE_WALLET
-		bin_PROGRAMS += wallet-utility
-	endif
+  bin_PROGRAMS += komodo-cli komodo-tx
+endif
+if ENABLE_WALLET
+  bin_PROGRAMS += wallet-utility
 endif

 LIBZCASH_H = \