aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5059Gavin Andresen2014-10-096-26/+103
|\
| * Trigger -alertnotify if network is upgrading without youGavin Andresen2014-10-094-1/+77
| * Refactor -alertnotify codeGavin Andresen2014-10-093-25/+26
* | Merge pull request #4996Pieter Wuille2014-10-083-10/+31
|\ \
| * | change exit(1) to an assert in CWallet::EncryptWalletPhilip Kaufmann2014-10-011-2/+4
| * | fix possible memory leaks in CWallet::EncryptWalletPhilip Kaufmann2014-10-012-6/+26
| * | fix a possible memory leak in CWalletDB::RecoverPhilip Kaufmann2014-10-011-4/+3
* | | Merge pull request #5004Pieter Wuille2014-10-088-164/+234
|\ \ \
| * | | Make SCRIPT_VERIFY_STRICTENC compatible with BIP62Pieter Wuille2014-10-088-164/+234
|/ / /
* | | Merge pull request #4834Pieter Wuille2014-10-0817-147/+393
|\ \ \
| * | | Get rid of the dummy CCoinsViewCache constructor argPieter Wuille2014-09-2414-24/+24
| * | | Add coins_tests with a large randomized CCoinViewCache test.Pieter Wuille2014-09-232-0/+179
| * | | Do not keep fully spent but unwritten CCoins entries cached.Pieter Wuille2014-09-234-31/+88
| * | | Get rid of CCoinsView's SetCoins and SetBestBlock.Pieter Wuille2014-09-237-44/+8
| * | | Use ModifyCoins instead of mutable GetCoins.Pieter Wuille2014-09-235-62/+108
* | | | Merge pull request #5051Wladimir J. van der Laan2014-10-082-98/+162
|\ \ \ \
| * | | | contrib: make linearize-data.py cope with out-of-order blocksWladimir J. van der Laan2014-10-062-98/+162
* | | | | Merge pull request #4979Wladimir J. van der Laan2014-10-083-8/+8
|\ \ \ \ \
| * | | | | add -timeout default as constant and use themPhilip Kaufmann2014-10-063-8/+8
| |/ / / /
* | | | | Merge pull request #5055Wladimir J. van der Laan2014-10-083-40/+179
|\ \ \ \ \
| * | | | | Prettify JSON tests and minimize diffsPieter Wuille2014-10-073-40/+179
* | | | | | Merge pull request #5050Wladimir J. van der Laan2014-10-081-32/+39
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | contrib: use batched JSON-RPC in linarize-hashesWladimir J. van der Laan2014-10-061-32/+39
* | | | | | Merge pull request #4976Wladimir J. van der Laan2014-10-071-0/+2
|\ \ \ \ \ \
| * | | | | | qt: add proxy to options overridden if necessary.Cory Fields2014-09-251-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5041Wladimir J. van der Laan2014-10-071-0/+3
|\ \ \ \ \ \
| * | | | | | Disable App Nap on OSX 10.9+Michael Ford2014-10-041-0/+3
* | | | | | | Merge pull request #5047Wladimir J. van der Laan2014-10-072-3/+5
|\ \ \ \ \ \ \
| * | | | | | | minor txindex documentation improvementCozz Lovan2014-10-062-3/+5
* | | | | | | | contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan2014-10-071-13/+13
* | | | | | | | Merge pull request #5053Wladimir J. van der Laan2014-10-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Homebrew lang fixDominyk Tiller2014-10-061-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #5038Wladimir J. van der Laan2014-10-0714-61/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | Bugfix: Replace bashisms with standard sh in tests/toolsLuke Dashjr2014-10-033-15/+15
| * | | | | | | | Bugfix: Replace bashisms with standard sh in gitian descriptorsLuke Dashjr2014-10-037-11/+11
| * | | | | | | | Bugfix: Replace bashisms with standard sh to fix build on non-BASH systemsLuke Dashjr2014-10-033-33/+36
| * | | | | | | | travis: add non-default shell testing to travis.Cory Fields2014-10-031-2/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4954Wladimir J. van der Laan2014-10-071-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Don't return an address for invalid pubkeysAndy Alness2014-10-061-2/+13
* | | | | | | | Merge pull request #5049Pieter Wuille2014-10-064-11/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix a lock indentation in main.cppPhilip Kaufmann2014-10-061-5/+5
| * | | | | | | minor license, header end comment etc. cleanup in /scriptPhilip Kaufmann2014-10-063-6/+6
|/ / / / / / /
* | | | | | | Merge pull request #5036Wladimir J. van der Laan2014-10-064-220/+182
|\ \ \ \ \ \ \
| * | | | | | | Update English translationWladimir J. van der Laan2014-10-022-201/+161
| * | | | | | | Don't translate state.Abort() messagesWladimir J. van der Laan2014-10-022-19/+21
* | | | | | | | Merge pull request #4890Wladimir J. van der Laan2014-10-0615-135/+215
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Replace SCRIPT_VERIFY_NOCACHE by flag directly to checkerPieter Wuille2014-10-0213-74/+64
| * | | | | | | Make signature cache optionalPieter Wuille2014-10-029-88/+155
| * | | | | | | Abstract out SignatureCheckerPieter Wuille2014-10-024-14/+37
| |/ / / / / /
* | | | | | | Merge pull request #5035Wladimir J. van der Laan2014-10-041-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |