]> Git Repo - VerusCoin.git/commitdiff
Merge pull request #5100
authorPieter Wuille <[email protected]>
Tue, 28 Oct 2014 12:22:34 +0000 (05:22 -0700)
committerPieter Wuille <[email protected]>
Tue, 28 Oct 2014 12:27:41 +0000 (05:27 -0700)
99f41b9 MOVEONLY: core.o -> core/block.o (jtimon)
561e9e9 MOVEONLY: Move script/compressor out of script and put CTxOutCompressor (from core) with it (jtimon)
999a2ab MOVEONLY: separate CTxUndo out of core (jtimon)
4a3587d MOVEONLY: Separate CTransaction and dependencies from core (jtimon)
eda3733 MOVEONLY: Move CFeeRate and Amount constants to amount.o (jtimon)

1  2 
src/Makefile.am
src/script/interpreter.cpp
src/wallet.h

diff --cc src/Makefile.am
index 1f8f9aabdcbaf13c9914562d7c9e9e985163becd,4ca75d6a775a296cf73aaa716fcffaec6736294d..91cc1b96e7221a62850d886a020fe997db4076bb
@@@ -212,10 -214,11 +215,12 @@@ libbitcoin_common_a_SOURCES = 
    base58.cpp \
    chainparams.cpp \
    coins.cpp \
-   core.cpp \
+   compressor.cpp \
+   core/block.cpp \
+   core/transaction.cpp \
    core_read.cpp \
    core_write.cpp \
 +  ecwrapper.cpp \
    hash.cpp \
    key.cpp \
    keystore.cpp \
Simple merge
diff --cc src/wallet.h
Simple merge
This page took 0.032358 seconds and 4 git commands to generate.