Patch 23 #100
Merged
Patch 23 #100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-BEGIN VERIFY SCRIPT- sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp src/zcash/*/*.tcc ; -END VERIFY SCRIPT-
-BEGIN VERIFY SCRIPT- sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; sed -i ':a;N;$!ba;s/#define std::pair<t1, t2> std::pair<t1, t2>\n//' ./src/utilstrencodings.h ; -END VERIFY SCRIPT-
nHeight > GetCommunityFeeStartHeight() && nHeight <= GetLastCommunityFeeBlockHeight()
Merge 'dev1' branch
Merge 'dev2' branch
Merge 'dev3' branch
…pted in main thread
- Small httpserver.cpp backports - Optimise reindex - Don't recommend -reindex-chainstate - Make -reindex and -reindex-chainstate imply -rescan - Scan wallet from genesis when reindexing - Bitcoin 0.12 Merkle tree PRs - Reduce memory usage of CBlockIndex - Remove const annotation from blockinfo iterator type - Fetch recently conflicted transactions incrementally in ThreadNotifyWallet - Set hashFinalSaplingRoot in AddToBlockIndex and ConnectBlock
Skip note which has been spent and locked notes before decrypting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for broken cross-build to Windows target