aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-171-1/+1
|\
| * Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-171-1/+1
| |\
| | * Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-171-1/+1
| | |\
| | | * Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-171-1/+1
| | | |\
| | | | * ConnectBlock(): fix error() format to be unsignedPhilip Kaufmann2012-11-171-1/+1
| | | | * ensure we use our format macros to avoid compilation warningsPhilip Kaufmann2012-11-171-1/+1
* | | | | Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-161-1/+1
|\| | | |
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-161-1/+1
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-161-1/+1
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-161-1/+1
| | | |\|
| | | | * Print error for coinbase-pays-too-much case of ConnectBlock failingLuke Dashjr2012-11-161-1/+1
* | | | | Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-141-1/+0
|\| | | |
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-141-1/+2
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-141-1/+2
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-141-1/+2
| | | |\|
| | | | * Fixes a race condition in CreateNewBlock.Gregory Maxwell2012-11-121-1/+2
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-09-171-2/+11
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-09-171-2/+11
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-09-171-2/+11
| | | |\|
| | | | * Apply BIP30 checks to all blocks except the two historic violations.Gregory Maxwell2012-09-171-2/+11
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-271-0/+22
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-271-6/+41
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-271-0/+22
| | | |\|
| | | | * Special-case the last alert for alert-key-compromised caseGavin Andresen2012-08-271-0/+22
| | | * | Alert system DoS preventionGavin Andresen2012-08-271-6/+19
| * | | | Alert system DoS preventionGavin Andresen2012-08-271-6/+19
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-261-2/+37
| |\| | |
| | * | | Merge commit '689b878' into 0.6.0.xLuke Dashjr2012-08-261-1/+10
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-261-2/+37
| | | |\|
| | | | * Reject block.nVersion<=1 blocks if network has upgraded to version=2Gavin Andresen2012-08-261-1/+10
| | * | | Merge commit '9adab76' into 0.6.0.xLuke Dashjr2012-08-261-1/+27
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Block height in coinbase as a new block ruleGavin Andresen2012-08-261-1/+27
| | * | | Merge commit 'd710ed5' into 0.6.0.xLuke Dashjr2012-08-261-1/+1
| | |\| |
| | | * | fix a compiler sign warning in OpenBlockFile()Philip Kaufmann2012-08-221-1/+1
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-121-3/+3
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-3/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-3/+3
| | | |\|
| | | | * Bugfix: Correct English grammar regarding "'s"Luke Dashjr2012-08-121-3/+3
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-121-14/+14
| |\| | |
| | * | | Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-121-1/+1
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-13/+13
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-13/+13
| | | |\|
| | | | * Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-121-13/+13
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-07-221-1/+1
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-07-221-1/+1
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-07-221-1/+1
| | | |\|
| | | | * Let the comment in GetBlockValue() reflect the uncertainty about the time int...Rune K. Svendsen2012-07-221-1/+1
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-06-211-23/+58
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-06-201-23/+58
| | | |\|
| | | | * print large orphan warning BEFORE deleting pvMsgGavin Andresen2012-06-201-1/+1