finalize rebase

tendermint · Sep 26, 2018 · 02eb642 · 02eb642
1 parent 5af0c87
commit 02eb642
Show file tree

Hide file tree

Showing 4 changed files with 327 additions and 496 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ install:
 ########################################
 ### Protobuf
 
-protoc_all: protoc_libs protoc_abci protoc_grpc
+protoc_all: protoc_libs protoc_merkle protoc_abci protoc_grpc
 
 %.pb.go: %.proto
 	## If you get the following error,