Merge #8077: Consensus: Decouple from chainparams.o and timedata.o
commit715e9fd7454f7a48d7adba7d42f662c20a3e3367
authorPieter Wuille <pieter.wuille@gmail.com>
Wed, 1 Jun 2016 18:51:29 +0000 (1 20:51 +0200)
committerPieter Wuille <pieter.wuille@gmail.com>
Wed, 1 Jun 2016 18:52:27 +0000 (1 20:52 +0200)
tree26ed8868308d52a1571df2ba5ddf883fb45bd740
parent2e0a99037dcc35bc63ba0d54371bc678af737c8e
parentee9f4a5b1505113eae0fe8d70fd0414bd5bce0ff
Merge #8077: Consensus: Decouple from chainparams.o and timedata.o

ee9f4a5 Consensus: Decouple from chainparams.o and timedata.o (Jorge Timón)
src/main.cpp