Merge pull request #5 from jl777/master

master
chips-blockchain · Jul 15, 2019 · 23c8b02 · 23c8b02
2 parents 6b036bc + 44b286a
commit 23c8b02
Show file tree

Hide file tree

Showing 18 changed files with 13,838 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,7 @@ src/qt/test/moc*.cpp
 
 # Compilation and Qt preprocessor part
 *.qm
-Makefile
+# Makefile -->commented by sg777
 bitcoin-qt
 Bitcoin-Qt.app
 
@@ -109,3 +109,7 @@ test/cache/*
 
 libbitcoinconsensus.pc
 contrib/devtools/split-debug.sh
+
+src/chipsd
+src/chips-tx
+src/chips-cli
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bet"]
+	path = bet
+	url = https://github.com/sg777/bet.git