Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

commits from bitcoin/master #303

Merged
merged 10 commits into from Apr 20, 2018
Merged

commits from bitcoin/master #303

merged 10 commits into from Apr 20, 2018

Conversation

@Bushstar
Copy link
Collaborator

Bushstar commented Apr 20, 2018

Dead code removal
bitcoin/bitcoin#13025

net: Minor accumulated cleanups
bitcoin/bitcoin#12855

Fix include comment in src/interfaces/wallet.h
bitcoin/bitcoin#13026

Enforce SCRIPT_VERIFY_P2SH and SCRIPT_VERIFY_WITNESS from genesis
bitcoin/bitcoin#11739

MOVEONLY: Move logging code from util.{h,cpp} to new files.
bitcoin/bitcoin#13021

@Bushstar Bushstar merged commit 18c2c1f into FeatherCoin:master Apr 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.