Align with branch v0.11.0.x of darkcoin/darkcoin.

Author: donSchoe

.gitignore

@@ -1,11 +1,6 @@
 *.tar.gz
 
 *.exe
-src/bitcoin
-src/bitcoind
-src/bitcoin-cli
-src/test/test_bitcoin
-src/qt/test/test_bitcoin-qt
 src/darkcoin
 src/darkcoind
 src/darkcoin-cli
@@ -41,7 +36,6 @@ src/qt/test/moc*.cpp
 *.o
 *.o-*
 *.patch
-.bitcoin
 .darkcoin
 *.a
 *.pb.cc
@@ -57,14 +51,11 @@ src/qt/test/moc*.cpp
 # Compilation and Qt preprocessor part
 *.qm
 Makefile
-bitcoin-qt
 darkcoin-qt
-Bitcoin-Qt.app
 Darkcoin-Qt.app
 
 # Unit-tests
 Makefile.test
-bitcoin-qt_test
 darkcoin-qt_test
 
 # Resources cpp
@@ -80,7 +71,6 @@ build
 #lcov
 *.gcno
 /*.info
-test_bitcoin.coverage/
 test_darkcoin.coverage/
 total.coverage/
 coverage_percent.txt
@@ -93,3 +83,6 @@ qa/pull-tester/run-bitcoind-for-test.sh
 qa/pull-tester/build-tests.sh
 
 !src/leveldb*/Makefile
+
+.cproject
+.project

qa/rpc-tests/util.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2014 The Bitcoin Core developers
-# Copyright (c) 2014 vertoe & the Darkcoin developers
+# Copyright (c) 2014 The Darkcoin developers
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Helpful routines for regression testing
 #
 
-# Add python-bitcoinrpc to module search path:
+# Add python-bitcoinrpc to module search path:      
 import os
 import sys
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))

qa/rpc-tests/util.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Copyright (c) 2014 The Bitcoin Core developers
-# Copyright (c) 2014 vertoe & the Darkcoin developers
+# Copyright (c) 2014 The Darkcoin developers
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

qa/rpc-tests/walletbackup.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Copyright (c) 2014 The Bitcoin Core developers
-# Copyright (c) 2014 vertoe & the Darkcoin developers
+# Copyright (c) 2014 The Darkcoin developers
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/Makefile.am

@@ -25,6 +25,7 @@ DIST_SUBDIRS = . qt test
 .PHONY: FORCE
 # darkcoin core #
 BITCOIN_CORE_H = \
+  activemasternode.h \
   addrman.h \
   alert.h \
   allocators.h \
@@ -39,14 +40,17 @@ BITCOIN_CORE_H = \
   compat.h \
   core.h \
   crypter.h \
+  darksend.h \
   db.h \
   hash.h \
   init.h \
+  instantx.h \
   key.h \
   keystore.h \
   leveldbwrapper.h \
   limitedmap.h \
   main.h \
+  masternode.h \
   miner.h \
   mruset.h \
   netbase.h \
@@ -100,6 +104,7 @@ obj/build.h: FORCE
 version.o: obj/build.h
 
 libdarkcoin_server_a_SOURCES = \
+  activemasternode.cpp \
   addrman.cpp \
   alert.cpp \
   bloom.cpp \
@@ -113,6 +118,7 @@ libdarkcoin_server_a_SOURCES = \
   net.cpp \
   noui.cpp \
   rpcblockchain.cpp \
+  rpcdarksend.cpp \
   rpcmining.cpp \
   rpcmisc.cpp \
   rpcnet.cpp \
@@ -124,6 +130,7 @@ libdarkcoin_server_a_SOURCES = \
   $(BITCOIN_CORE_H)
 
 libdarkcoin_wallet_a_SOURCES = \
+  activemasternode.cpp \
   db.cpp \
   crypter.cpp \
   rpcdump.cpp \
@@ -133,10 +140,14 @@ libdarkcoin_wallet_a_SOURCES = \
   $(BITCOIN_CORE_H)
 
 libdarkcoin_common_a_SOURCES = \
+  activemasternode.cpp \
   base58.cpp \
   allocators.cpp \
   chainparams.cpp \
   core.cpp \
+  darksend.cpp \
+  masternode.cpp \
+  instantx.cpp \
   hash.cpp \
   key.cpp \
   netbase.cpp \