Skip to content

Conversation

jtimon
Copy link
Contributor

@jtimon jtimon commented May 22, 2015

-UndoWriteToDisk
-WriteBlockToDisk

It also contains a commit from #5669 (to avoid the later rebase conflict if that gets merged sooner).

@jtimon jtimon force-pushed the chainparams-message branch from 6b32a0f to 260f5c9 Compare May 22, 2015 00:26
@theuni
Copy link
Member

theuni commented May 22, 2015

ut ACK 260f5c9

@laanwj
Copy link
Member

laanwj commented May 27, 2015

utACK (and needs rebase)

@jtimon jtimon force-pushed the chainparams-message branch from 260f5c9 to e697343 Compare May 27, 2015 14:10
@jtimon
Copy link
Contributor Author

jtimon commented May 27, 2015

Rebased (confused about why github required the rebase, it was a clean rebase).

@laanwj laanwj merged commit e697343 into bitcoin:master May 27, 2015
laanwj added a commit that referenced this pull request May 27, 2015
e697343 Chainparams: Explicit CMessageHeader::MessageStartChars to functions in main: (Jorge Timón)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants