aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #951 from TheBlueMatt/headerslimitGavin Andresen2012-04-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Limit getheaders to a hard 2000.Matt Corallo2012-03-191-2/+2
* | | | | | | | Merge pull request #998 from Diapolo/transactiontablePieter Wuille2012-04-021-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | removed an ugly line break in a transaction tooltip for case TransactionStatu...Philip Kaufmann2012-03-271-4/+3
* | | | | | | | | Merge pull request #1022 from Diapolo/fix#1020Pieter Wuille2012-04-021-2/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hide Delete button (only) on ReceivingTab / hide Sign message button (only) o...Philip Kaufmann2012-04-011-2/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #995 from Diapolo/masterPieter Wuille2012-04-022-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed typo in comment in netbase.h and bignum.hPhilip Kaufmann2012-03-302-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1006 from Diapolo/tr-trayPieter Wuille2012-04-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | made tray icon tooltip translatablePhilip Kaufmann2012-03-291-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1018 from sipa/gpgPieter Wuille2012-04-023-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated my GPG keyPieter Wuille2012-03-313-2/+2
| |/ / / / / / / /
* | / / / / / / / Bump version to 0.6.0.99 for 0.6.1 merge windowGavin Andresen2012-04-022-2/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' of github.com:bitcoin/bitcoinv0.6.0rc6v0.6.0Gavin Andresen2012-03-291-24/+23
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1010 from sipa/fastblocks2Gavin Andresen2012-03-291-2/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use transactions-updated as flush conditionPieter Wuille2012-03-291-2/+12
| * | | | | | | | | Merge pull request #1008 from gavinandresen/addrworkaroundGavin Andresen2012-03-291-22/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Workaround hangs when upgrading old addr.dat filesGavin Andresen2012-03-291-22/+11
| |/ / / / / / / /
* / / / / / / / / Bump version to 0.6.0rc6Gavin Andresen2012-03-292-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #1007 from gavinandresen/log_auto_removeGavin Andresen2012-03-291-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Auto-remove logs, and decrease logfile size to 10MGavin Andresen2012-03-291-2/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #996 from Diapolo/tx-lang-updGavin Andresen2012-03-2932-3336/+6273
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | update translations from transifexPhilip Kaufmann2012-03-2732-3336/+6273
|/ / / / / / /
* | | | | | | Update version to 60005 (0.6.0rc5)v0.6.0rc5Gavin Andresen2012-03-262-2/+2
* | | | | | | Merge branch 'master' of github.com:bitcoin/bitcoinGavin Andresen2012-03-260-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #994 from sipa/deladdrGavin Andresen2012-03-262-20/+12
| |\ \ \ \ \ \ \
* | | | | | | | | Merge branch 'master' of github.com:bitcoin/bitcoinGavin Andresen2012-03-261-0/+4
|\| | | | | | | |
| * | | | | | | | Merge pull request #992 from gavinandresen/remove_wxBitcoinGavin Andresen2012-03-261-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove wxWidgets .exe and locales during setupGavin Andresen2012-03-261-0/+4
* | | | | | | | | | Merge branch 'master' of github.com:bitcoin/bitcoinGavin Andresen2012-03-2621-139/+157
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #991 from gavinandresen/disableWinURIGavin Andresen2012-03-263-5/+21
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Disable bitcoin: URI handling on Windows for the 0.6 releaseGavin Andresen2012-03-263-5/+21
| | |/ / / / / / /
| * | | | | | | | Merge pull request #990 from sipa/docWladimir J. van der Laan2012-03-2618-134/+136
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Begin doxygen-compatible commentsPieter Wuille2012-03-2618-134/+136
| | |/ / / / / / /
* | | | | | | | | Merge branch 'deladdr' of https://github.com/sipa/bitcoinGavin Andresen2012-03-262-20/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Use erase instead of rewrite to remove old addr entriesPieter Wuille2012-03-262-20/+12
| |/ / / / / /
* | | | | | | Merge pull request #988 from Diapolo/URL-HandlingWladimir J. van der Laan2012-03-261-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | make sure Window is shown when clicking bitcoin: Links to get user attentionPhilip Kaufmann2012-03-261-0/+5
|/ / / / / /
* | | | | | Merge pull request #974 from sipa/walletupgradePieter Wuille2012-03-254-22/+85
|\ \ \ \ \ \
| * | | | | | Introduce explicit -walletupgrade optionPieter Wuille2012-03-224-22/+85
* | | | | | | Merge pull request #983 from laanwj/2012_03_removeunusedutilPieter Wuille2012-03-252-51/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unused functions from util.h/util.cppWladimir J. van der Laan2012-03-252-51/+0
* | | | | | | | Merge pull request #984 from sipa/youngseedsPieter Wuille2012-03-251-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Give DNS seeds a random age between 3 and 7 days oldPieter Wuille2012-03-251-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #985 from TheBlueMatt/uriPieter Wuille2012-03-251-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix URI link to bitcoin-qt.exe instead of bitcoin.exeMatt Corallo2012-03-251-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #946 from luke-jr/bugfix_rm_mingwGavin Andresen2012-03-222-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of buildLuke Dashjr2012-03-222-3/+13
* | | | | | | | Merge branch 'checklevel' of https://github.com/sipa/bitcoinGavin Andresen2012-03-222-3/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Add -checklevel and improve -checkblocksPieter Wuille2012-03-222-3/+100