Skip to content

Commit

Permalink
Merge branch '26.x' into develop_bd
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackcoinDev committed Dec 16, 2024
2 parents d607d77 + 68474f5 commit 7f29051
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ Translations
------------

Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/bitcoin/bitcoin/).
[Blackcoin More's Transifex page](https://www.transifex.com/BlackcoinQT/BlackcoinMore/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
Translations might be periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.

Branches
-------

Expand Down
2 changes: 1 addition & 1 deletion src/kernel/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class CMainParams : public CChainParams {

// Deployment of SegWit (BIP141, BIP143, and BIP147)
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1750377600; // Friday, June 20, 2025 12:00:00 AM
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].min_activation_height = 0; // No activation delay

Expand Down

0 comments on commit 7f29051

Please sign in to comment.