aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* DoS fix for mapOrphanTransactionsv0.6.0rc2Gavin Andresen2012-02-293-1/+104
* Merge branch 'mruinventory' of https://github.com/sipa/bitcoinGavin Andresen2012-02-284-1/+157
|\
| * Add mruset and use it for setInventoryKnownPieter Wuille2012-02-274-1/+157
* | Merge branch '2012_02_getspecialfolderpath_overflow' of https://github.com/la...Gavin Andresen2012-02-281-33/+10
|\ \
| * | Simplify MyGetSpecialFolderPath and fix possible buffer overflow (#901)Wladimir J. van der Laan2012-02-261-33/+10
* | | Merge pull request #910 from fanquake/masterPieter Wuille2012-02-281-1/+1
|\ \ \
| * | | "February"Michael Ford2012-02-281-1/+1
|/ / /
* | | Do not start bitcoin: thread on OSX. fixes #889Gavin Andresen2012-02-271-0/+5
* | | Merge branch 'nodosbip16' of https://github.com/sipa/bitcoinGavin Andresen2012-02-271-0/+7
|\ \ \
| * | | Do not invoke anti-DoS system for invalid BIP16 transactionsPieter Wuille2012-02-251-0/+7
* | | | Move BIP16 switchover time to April 1Gavin Andresen2012-02-271-1/+1
* | | | Merge branch 'nooptionsinwallet+fixproxysetting' of https://github.com/sipa/b...Gavin Andresen2012-02-2712-143/+187
|\ \ \ \ | |_|_|/ |/| | |
| * | | Store addrProxy port in settingsPieter Wuille2012-02-261-4/+4
| * | | Reworked QT settingsGavin Andresen2012-02-266-53/+153
| * | | bitcoind changes to stop storing settings in wallet.dat.Gavin Andresen2012-02-267-104/+34
| * | | Fix addrProxy settingPieter Wuille2012-02-252-3/+17
| | |/ | |/|
* | | Merge pull request #853 from laanwj/2012_02_altminimizetrayWladimir J. van der Laan2012-02-262-29/+27
|\ \ \
| * | | Do show/showNormal only when needed.Wladimir J. van der Laan2012-02-172-7/+18
| * | | Hide window from taskbar when "minimize to tray" active by making window into...Wladimir J. van der Laan2012-02-172-22/+9
* | | | Merge pull request #900 from sipa/movebackupmenuWladimir J. van der Laan2012-02-261-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Move 'Backup Wallet' to file menuPieter Wuille2012-02-261-2/+2
|/ / /
* | | Merge pull request #897 from laanwj/2012_02_fixnegativesecsWladimir J. van der Laan2012-02-251-4/+11
|\ \ \ | |_|/ |/| |
| * | In UI, handle cases in which the last received block was generated in the fut...Wladimir J. van der Laan2012-02-251-4/+11
* | | Merge pull request #894 from dooglus/nosplashWladimir J. van der Laan2012-02-242-4/+9
|\ \ \
| * | | Add option "-splash" so we can disable the splash screen.Chris Moore2012-02-242-4/+9
|/ / /
* | | Checkpoint block 168,000Gavin Andresen2012-02-231-0/+1
* | | Merge branch 'getblock_cleanup' of https://github.com/luke-jr/bitcoinGavin Andresen2012-02-231-10/+17
|\ \ \
| * | | Cleanup JSON-RPC getblock output to be consistentLuke Dashjr2012-02-221-10/+17
* | | | Merge pull request #887 from TheBlueMatt/gitian_depsPieter Wuille2012-02-233-10/+20
|\ \ \ \
| * | | | Make deps build deterministic and upgrade to libpng 1.5.9.Matt Corallo2012-02-223-10/+20
|/ / / /
* | | | Merge branch 'testnetirc' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-0/+5
|\ \ \ \
| * | | | Leave IRC enabled by default on testnetPieter Wuille2012-02-221-0/+5
* | | | | Merge branch 'fixnullpfrom' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-2/+4
|\ \ \ \ \
| * | | | | ProcessBlock is sometimes called with pfrom==NULLPieter Wuille2012-02-201-2/+4
| |/ / / /
* | | | | Merge branch 'postfeb20' of https://github.com/sipa/bitcoinGavin Andresen2012-02-223-39/+27
|\ \ \ \ \
| * | | | | Post-feb20 simplificationsPieter Wuille2012-02-213-39/+27
* | | | | | Merge branch 'reorginfo' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-0/+3
|\ \ \ \ \ \
| * | | | | | Report number of (dis)connected blocks in reorganizationPieter Wuille2012-02-191-0/+3
* | | | | | | Merge branch 'fix_616' of https://github.com/sipa/bitcoinGavin Andresen2012-02-221-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix #616: remove base_uint::operator&=(uint64 b)Pieter Wuille2012-02-191-7/+0
| |/ / / / / /
* | | | | | | Merge branch 'fix_626' of https://github.com/sipa/bitcoinGavin Andresen2012-02-224-52/+52
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix #626: RecvLine wrong error messagePieter Wuille2012-02-194-52/+52
| |/ / / / /
* | | | | | Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoinGavin Andresen2012-02-221-1/+1
|\ \ \ \ \ \
| * | | | | | Bugfix: Instead of reporting "bitcoin-qt" for both bitcoind and Bitcoin-Qt, r...Luke Dashjr2012-02-221-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoinGavin Andresen2012-02-225-17/+80
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix default suffixes in save dialog in GNOME, make it more clear that PNG is ...Wladimir J. van der Laan2012-02-155-11/+70
| * | | | | (trivial) regularize coding styleWladimir J. van der Laan2012-02-151-6/+10
* | | | | | Fix tests after 38067c18Pieter Wuille2012-02-205-16/+16
| |_|_|/ / |/| | | |
* | | | | Merge pull request #857 from laanwj/2012_02_fixhelpwindowWladimir J. van der Laan2012-02-202-12/+9
|\ \ \ \ \
| * | | | | On windows, show message box with help, as there is no stderr (fixes #702)Wladimir J. van der Laan2012-02-172-12/+9