aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | 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
* | | | | | | | | Merge pull request #858 from laanwj/2012_02_uisendlabelfixWladimir J. van der Laan2012-02-201-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only fill in label from address book, if no label is filled in yet, fixes #840Wladimir J. van der Laan2012-02-171-2/+3
* | | | | | | | | | Merge pull request #876 from luke-jr/signmsg_descGregory Maxwell2012-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sign message description changes discussed in #bitcoin-devLuke Dashjr2012-02-191-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Typo fixPieter Wuille2012-02-201-1/+1
* | | | | | | | | | Merge pull request #864 from sipa/fix_856Pieter Wuille2012-02-197-15/+64
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make compressed pubkeys require 0.6.0Pieter Wuille2012-02-182-2/+9
| * | | | | | | | | | Move GenerateNewKey back to CWalletPieter Wuille2012-02-184-12/+12
| * | | | | | | | | | Add SetMinVersion to CWalletPieter Wuille2012-02-184-2/+44
* | | | | | | | | | | Merge pull request #868 from sipa/fix_650Pieter Wuille2012-02-191-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix #650: CKey::SetSecret BIGNUM leakPieter Wuille2012-02-191-1/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #867 from laanwj/2012_02_hidetrayicononquitWladimir J. van der Laan2012-02-191-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Hide tray icon in destructor, as deleting will let it linger until quit (on U...Wladimir J. van der Laan2012-02-191-0/+2
* | | | | | | | | | Merge pull request #863 from sipa/bn2mpifixPieter Wuille2012-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Workaround for BN_bn2mpi reading/writing out of boundsPieter Wuille2012-02-181-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #865 from sipa/del_pwalletdbPieter Wuille2012-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Free pwalletdbEncryption after encryping walletPieter Wuille2012-02-181-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #862 from TheBlueMatt/warningsPieter Wuille2012-02-181-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix compilation warning.Matt Corallo2012-02-181-0/+1
* | | | | | | | | Merge pull request #859 from laanwj/2012_02_guilanguageargWladimir J. van der Laan2012-02-182-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow setting UI language from commandline (implements #678)Wladimir J. van der Laan2012-02-172-2/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #854 from laanwj/2012_02_qtipcWladimir J. van der Laan2012-02-177-40/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restructure IPC URL handling (fixes #851)Wladimir J. van der Laan2012-02-177-40/+39
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nolisten_bitcoin_conf_2' of https://github.com/dooglus/bitcoinGavin Andresen2012-02-171-11/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as wel...Chris Moore2012-02-161-11/+21
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-gitGavin Andresen2012-02-173-4/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #848 : broken mining on testnetGavin Andresen2012-02-163-4/+21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'threadid' of https://github.com/sipa/bitcoinGavin Andresen2012-02-174-70/+82
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Symbolic names for threadsPieter Wuille2012-02-164-70/+82
* | | | | | | | | | Merge pull request #834 from sje397/BackupWalletWladimir J. van der Laan2012-02-179-7/+42
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Added 'Backup Wallet' menu optionsje3972012-02-159-7/+42
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Change #ifdef GUI to #ifdef QT_GUI, GUI is not defined anymore...Wladimir J. van der Laan2012-02-171-4/+4
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | don't allow -daemon in bitcoin-qt (changes only #defines)Wladimir J. van der Laan2012-02-171-3/+3
* | | | | | | | fix typo in CNetAddr::IsRFC4843() (fixes #850)Wladimir J. van der Laan2012-02-171-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #843 from TheBlueMatt/qrcodedocPieter Wuille2012-02-167-21/+28
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Properly include $*_LIB_PATH in makefile.unixMatt Corallo2012-02-151-2/+2
| * | | | | | Make bitcoin-qt static-link libqrcode and add it for debian pkgs.Matt Corallo2012-02-155-13/+20
| * | | | | | Fix compilation warning.Matt Corallo2012-02-151-6/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #844 from sipa/shutdownfixPieter Wuille2012-02-161-5/+8
|\ \ \ \ \ \
| * | | | | | Several shutdown-related fixesPieter Wuille2012-02-151-5/+8
| |/ / / / /