Merge branch 'FSM' of https://github.com/jl777/komodo

2019-01-10 02:25:59 +08:00
parent 9646dd709a e755fa0e7b
commit a543b675f6
27 changed files with 226 additions and 801 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -302,7 +302,7 @@ libbitcoin_server_a_SOURCES = \
  cc/oracles.cpp \
  cc/prices.cpp \
  cc/pegs.cpp \
-  cc/triggers.cpp \
+  cc/marmara.cpp \
  cc/payments.cpp \
  cc/gateways.cpp \
  cc/channels.cpp \