Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/6038' into trivial-next
Browse files Browse the repository at this point in the history
Original PR: bitcoin#6038
  • Loading branch information
theuni committed Apr 23, 2015
2 parents c759a61 + 7def171 commit 5bf2cc1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/chainparams.cpp
Expand Up @@ -154,7 +154,7 @@ class CMainParams : public CChainParams {
vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Pieter Wuille
vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Addy Yeow
vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker
vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik

base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);
Expand Down

0 comments on commit 5bf2cc1

Please sign in to comment.