From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Fri, 15 May 2015 11:54:32 +0000 (+0200)
Subject: Merge pull request #6135
X-Git-Tag: v0.11.2.z0~141
X-Git-Url: https://repo.jachan.dev/VerusCoin.git/commitdiff_plain/e47c94e64c44e817ac80cf682a68ba0c4580952f

Merge pull request #6135

f13dac9 Comment edits and cleanup (BitcoinPRReadingGroup)
ff734e9 Alphabetic order in makefile (Jorge Timón)
5207f33 fix header include groups (Philip Kaufmann)
59b149f remove unneeded incude of wallet/db.h from rpcmining.cpp (Philip Kaufmann)
3703385 remove unused classes from db.h (Philip Kaufmann)
0a7bcb7 fix IDE/compiler warning "extra ';'" in validationinterface.h (Philip Kaufmann)
3b00e7c [Trivial] Update COPYING (sandakersmann)
dd9e688 Trivial: Corrected owner of DNS seeder (ayeowch)
a60bfd8 [init] better message when no wallet support is compiled in (Philip Kaufmann)
78f44b6 Capitalized P2P (sandakersmann)
8e9248d [Trivial] Cryptocurrency is one word (sandakersmann)
803f51e Typo in GetRawMemPool RPC method help: "]" --> "}" (Chris Arnesen)
605a735 addrman: update comments (Pavel Vasin)
---

e47c94e64c44e817ac80cf682a68ba0c4580952f
diff --cc src/Makefile.am
index 91d530222,24fd76e47..93ad26acf
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -117,10 -118,9 +119,10 @@@ BITCOIN_CORE_H = 
    rpcclient.h \
    rpcprotocol.h \
    rpcserver.h \
 +  scheduler.h \
    script/interpreter.h \
-   script/script_error.h \
    script/script.h \
+   script/script_error.h \
    script/sigcache.h \
    script/sign.h \
    script/standard.h \
@@@ -259,14 -255,15 +257,16 @@@ libbitcoin_common_a_SOURCES = 
    key.cpp \
    keystore.cpp \
    netbase.cpp \
+   primitives/block.cpp \
+   primitives/transaction.cpp \
    protocol.cpp \
    pubkey.cpp \
 +  scheduler.cpp \
    script/interpreter.cpp \
    script/script.cpp \
+   script/script_error.cpp \
    script/sign.cpp \
    script/standard.cpp \
-   script/script_error.cpp \
    $(BITCOIN_CORE_H)
  
  # util: shared between all executables.