Merge pull request #18 from zcoinofficial/dev

Merge Dev v0.2
firoorg · Oct 18, 2016 · 3602d24 · 3602d24
2 parents 948549e + 8c1c3e6
commit 3602d24
Show file tree

Hide file tree

Showing 67 changed files with 0 additions and 607 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 zcoin-qt
 build/*
 !build/.gitkeep
-src/obj/*
 src/zcoind
diff --git a/src/obj/Lyra2.o b/src/obj/Lyra2.o
diff --git a/src/obj/Sponge.o b/src/obj/Sponge.o
diff --git a/src/obj/addrman.P b/src/obj/addrman.P
diff --git a/src/obj/addrman.o b/src/obj/addrman.o
diff --git a/src/obj/alert.P b/src/obj/alert.P
diff --git a/src/obj/alert.o b/src/obj/alert.o
diff --git a/src/obj/auxpow.P b/src/obj/auxpow.P
diff --git a/src/obj/auxpow.o b/src/obj/auxpow.o
diff --git a/src/obj/bitcoinrpc.P b/src/obj/bitcoinrpc.P
diff --git a/src/obj/bitcoinrpc.o b/src/obj/bitcoinrpc.o
diff --git a/src/obj/bloom.P b/src/obj/bloom.P
diff --git a/src/obj/bloom.o b/src/obj/bloom.o
diff --git a/src/obj/checkpoints.P b/src/obj/checkpoints.P
diff --git a/src/obj/checkpoints.o b/src/obj/checkpoints.o
diff --git a/src/obj/crypter.P b/src/obj/crypter.P
diff --git a/src/obj/crypter.o b/src/obj/crypter.o
diff --git a/src/obj/db.P b/src/obj/db.P
diff --git a/src/obj/db.o b/src/obj/db.o
diff --git a/src/obj/hash.P b/src/obj/hash.P
diff --git a/src/obj/hash.o b/src/obj/hash.o
diff --git a/src/obj/init.P b/src/obj/init.P
diff --git a/src/obj/init.o b/src/obj/init.o
diff --git a/src/obj/key.P b/src/obj/key.P
diff --git a/src/obj/key.o b/src/obj/key.o
diff --git a/src/obj/keystore.P b/src/obj/keystore.P
diff --git a/src/obj/keystore.o b/src/obj/keystore.o
diff --git a/src/obj/leveldb.P b/src/obj/leveldb.P
diff --git a/src/obj/leveldb.o b/src/obj/leveldb.o
diff --git a/src/obj/main.P b/src/obj/main.P
diff --git a/src/obj/main.o b/src/obj/main.o
diff --git a/src/obj/net.P b/src/obj/net.P
diff --git a/src/obj/net.o b/src/obj/net.o
diff --git a/src/obj/netbase.P b/src/obj/netbase.P
diff --git a/src/obj/netbase.o b/src/obj/netbase.o
diff --git a/src/obj/noui.P b/src/obj/noui.P
diff --git a/src/obj/noui.o b/src/obj/noui.o