HomePhabricator

Merge branch 'checknewblock_0.6.0' into checknewblock
fbf99a9cdc32Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'checknewblock_0.6.0' into checknewblock

Conflicts:
src/main.cpp

Details

Provenance
Luke Dashjr <luke-jr+git@utopios.org>Authored on Jul 11 2012, 04:24
schancelPushed on Jan 5 2018, 21:58
schancelPushed on Jan 5 2018, 21:39
schancelPushed on Jan 5 2018, 21:17
Parents
rSTAGING3cd01fdf0e54: CreateNewBlock: Check that the produced CBlock is acceptable (except for proof…
rSTAGING232393e3bda1: Merge pull request #1569 from Diapolo/addressbookpage
Branches
Unknown
Tags
Unknown

Event Timeline

Luke Dashjr <luke-jr+git@utopios.org> committed rSTAGINGfbf99a9cdc32: Merge branch 'checknewblock_0.6.0' into checknewblock (authored by Luke Dashjr <luke-jr+git@utopios.org>).Jul 11 2012, 04:24