aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge pull request #3077 from sipa/chainGavin Andresen2013-10-1419-213/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Refactor/encapsulate chain globals into a CChain classPieter Wuille2013-10-1119-213/+217
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #2933 from sipa/leveldb113Gavin Andresen2013-10-1413-67/+363
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge src/leveldb changes for LevelDB 1.13Pieter Wuille2013-08-2413-67/+363
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Squashed 'src/leveldb/' changes from be1b0ff..936b461Pieter Wuille2013-08-2413-67/+363
* | | | | | | | | | | | | | | | | | | Merge pull request #3089 from gmaxwell/hsportGavin Andresen2013-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | [doc] Add testnet hidden service port to the example tor config.Gregory Maxwell2013-10-141-0/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #2937Pieter Wuille2013-10-136-4/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Added ping time measurement.Josh Lehan2013-10-046-4/+131
* | | | | | | | | | | | | | | | | | Merge pull request #3081 from Diapolo/silence_compilerWladimir J. van der Laan2013-10-111-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | prevent compiler redefinition warningsPhilip Kaufmann2013-10-111-0/+6
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3071 from gavinandresen/windows_hWladimir J. van der Laan2013-10-113-54/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remove include of windows.h from allocators.hGavin Andresen2013-10-093-54/+68
* | | | | | | | | | | | | | | | | | Merge pull request #3078 from gavinandresen/pulltesterGavin Andresen2013-10-102-20/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Disable code-coverage builds for nowGavin Andresen2013-10-111-11/+9
| * | | | | | | | | | | | | | | | | Rework pull-tester scripts, disable blockchain testerGavin Andresen2013-10-112-13/+45
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3066 from Diapolo/rem_globalWladimir J. van der Laan2013-10-093-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | make fCommandLine a local variable in AppInit()Philip Kaufmann2013-10-083-2/+1
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3068 from Diapolo/qt-iconWladimir J. van der Laan2013-10-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0Philip Kaufmann2013-10-081-0/+4
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'pulltestwin32'Gavin Andresen2013-10-081-11/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Re-enable win32 pull-testingGavin Andresen2013-10-081-11/+12
* | | | | | | | | | | | | | | | Merge pull request #3059 from Diapolo/ShutdownGavin Andresen2013-10-071-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add missing Boost Thread join_all() call during shutdownPhilip Kaufmann2013-10-071-4/+13
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3064 from Diapolo/styleWladimir J. van der Laan2013-10-071-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | style-police: fixed badly readable code in ProcessMessage()Philip Kaufmann2013-10-071-4/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3056 from Diapolo/stuck_debug_windowWladimir J. van der Laan2013-10-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bitcoin-Qt: prevent stuck/unusable debug window on exitPhilip Kaufmann2013-10-051-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3053 from dajohi/masterGavin Andresen2013-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Hurricane Electric uses block 2001:470::, not 2011:470::David Hill2013-10-041-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3047 from Diapolo/misbehaveGavin Andresen2013-10-041-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | special case DoS value == 0 in ProcessMessage()Philip Kaufmann2013-10-041-4/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2947 from gmaxwell/theyre_maturing_faster_these_daysGavin Andresen2013-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [wallet] Consider generated coins mature at COINBASE_MATURITY+1Gregory Maxwell2013-08-281-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2999 from TheBlueMatt/masterGavin Andresen2013-10-032-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update contrib/debian: proper desktop category and update changelogMatt Corallo2013-09-172-1/+25
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3040 from Diapolo/Qt_misc2Gavin Andresen2013-10-031-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bitcoin-Qt: add missing change from branch Qt_miscPhilip Kaufmann2013-10-011-5/+2
* | | | | | | | | | | | | | Merge pull request #3050 from Diapolo/fix_IsRFC4193_commentGavin Andresen2013-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix #3049 by changing comment for CNetAddr::IsRFC4193()Philip Kaufmann2013-10-031-1/+1
* | | | | | | | | | | | | | | Merge pull request #3051 from Diapolo/bitcoind-rcGavin Andresen2013-10-032-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rename bitcoin-res.rc to bitcoind-res.rcPhilip Kaufmann2013-10-032-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3028 from Michagogo/fix-dep-linksGavin Andresen2013-10-031-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | HTTPS-ify the downloads for the depsMicha2013-10-041-5/+5
| * | | | | | | | | | | | | | | Switch the order of win32 deps and win32 qt in release-process.mdMicha2013-10-041-2/+2
| * | | | | | | | | | | | | | | Fix and improve release-process.mdMicha2013-10-041-3/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3038 from Diapolo/Log_ShutdownJeff Garzik2013-10-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | log start and end of Shutdown()Philip Kaufmann2013-10-021-0/+2
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / RPC validateaddress: test pwalletMain for NULL (no-wallet mode)Jeff Garzik2013-10-021-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'pwalletmain' - checking pwalletMain for NULL,Jeff Garzik2013-10-016-92/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \