]> Git Repo - VerusCoin.git/commitdiff
Merge pull request #4981
authorWladimir J. van der Laan <[email protected]>
Wed, 22 Oct 2014 10:08:51 +0000 (12:08 +0200)
committerWladimir J. van der Laan <[email protected]>
Wed, 22 Oct 2014 10:16:50 +0000 (12:16 +0200)
85c579e script: add a slew of includes all around and drop includes from script.h (Cory Fields)
db8eb54 script: move ToString and ValueString out of the header (Cory Fields)
e9ca428 script: add ToByteVector() for converting anything with begin/end (Cory Fields)
066e2a1 script: move CScriptID to standard.h and add a ctor for creating them from CScripts (Cory Fields)

1  2 
src/chain.h
src/chainparams.cpp
src/main.h
src/miner.cpp

diff --cc src/chain.h
Simple merge
Simple merge
diff --cc src/main.h
Simple merge
diff --cc src/miner.cpp
Simple merge
This page took 0.033084 seconds and 4 git commands to generate.