aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2613 from jonasschnelli/prefsFixWladimir J. van der Laan2013-06-034-5/+60
|\ \ \ \ \ \
| * | | | | | Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFixJonas Schnelli2013-06-03166-9049/+14968
| |\| | | | |
| * | | | | | MaxOSX: settings fixes (#2371)Jonas Schnelli2013-06-034-5/+60
* | | | | | | Merge pull request #2727 from TheBlueMatt/masterWladimir J. van der Laan2013-06-031-1/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add new data-driven test-case.Matt Corallo2013-06-021-1/+7
* | | | | | | Merge pull request #2672 from Diapolo/Qt_testnetWladimir J. van der Laan2013-06-023-48/+47
|\ \ \ \ \ \ \
| * | | | | | | Bitcoin-Qt: setup testnet GUI directlyPhilip Kaufmann2013-06-023-48/+47
|/ / / / / / /
* | | | | | | Merge pull request #2588 from Diapolo/GetBoolArgWladimir J. van der Laan2013-06-0210-76/+61
|\ \ \ \ \ \ \
| * | | | | | | remove GetBoolArg() fDefault parameter defaulting to falsePhilip Kaufmann2013-06-0110-76/+61
* | | | | | | | Merge pull request #2721 from laanwj/2013_05_qt5Wladimir J. van der Laan2013-06-0217-14/+90
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Qt5 compatibilityWladimir J. van der Laan2013-06-0117-14/+90
* | | | | | | | Merge pull request #2722 from trapp/masterWladimir J. van der Laan2013-05-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added NSHighResolutionCapable flag to Info.plist for better font rendering on...Timon Rapp2013-05-311-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #2616 from vinniefalco/leveldb-as-subtreePieter Wuille2013-05-300-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'c25e98186d0f716451ef000e55646d25e014f573' as 'src/leveldb'Vinnie Falco2013-05-03136-0/+27582
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Squashed 'src/leveldb/' content from commit aca1ffcVinnie Falco2013-05-03136-0/+27582
| | / / / / /
| * | | | | | Remove leveldb in preparation for git-subtreeVinnie Falco2013-05-03136-27582/+0
* | | | | | | Merge pull request #2552 from Diapolo/win-typedefJeff Garzik2013-05-301-2/+0
|\ \ \ \ \ \ \
| * | | | | | | remove obsolete and unused typedef for WindowsPhilip Kaufmann2013-04-231-2/+0
* | | | | | | | Merge pull request #2615 from jonasschnelli/mac10_8_not_centerWladimir J. van der Laan2013-05-305-21/+128
|\ \ \ \ \ \ \ \
| * | | | | | | | osx: make use of the 10.8+ user notification center to display growl like not...Jonas Schnelli2013-05-245-21/+128
* | | | | | | | | Merge pull request #2716 from laanwj/2013_05_30_getworkJeff Garzik2013-05-304-10/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move pMiningKey init out of StartRPCThreadsWladimir J. van der Laan2013-05-304-10/+21
* | | | | | | | | | Merge pull request #2705 from robbak/crash_zero_size_peers.datJeff Garzik2013-05-301-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't attempt to resize vector to negative size.Robert Backhaus2013-05-291-0/+2
* | | | | | | | | | | Merge pull request #2644 from sipa/constfindblockJeff Garzik2013-05-305-51/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make FindBlockByHeight constant-time.Pieter Wuille2013-05-125-51/+36
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2642 from sipa/rightgenesisJeff Garzik2013-05-301-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check for correct genesisPieter Wuille2013-05-121-0/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2625 from gavinandresen/walletlock_asioJeff Garzik2013-05-304-63/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use boost::asio::deadline_timer for walletpassphrase timeoutGavin Andresen2013-05-074-63/+43
* | | | | | | | | | | | Merge pull request #2600 from sipa/keyrefactorJeff Garzik2013-05-3028-595/+641
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make signature cache store CPubKeysPieter Wuille2013-05-303-12/+19
| * | | | | | | | | | | | CSecret/CKey -> CKey/CPubKey split/refactorPieter Wuille2013-05-3026-595/+564
| * | | | | | | | | | | | Make CPubKey statically allocatedPieter Wuille2013-05-307-28/+98
* | | | | | | | | | | | | Merge pull request #2693 from jgarzik/checkpoint-boolJeff Garzik2013-05-303-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Replace repeated GetBoolArg() calls with Checkpoint::fEnabled variableJeff Garzik2013-05-243-3/+9
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2104 from al42and/listreceivedbyaddress_txidsJeff Garzik2013-05-302-8/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Updated help and tests for getreceivedby(account|address)Andrey2012-12-162-10/+35
| * | | | | | | | | | | | | listreceivedbyaddress now provides tx ids (issue #1149)Andrey2012-12-131-0/+8
* | | | | | | | | | | | | | Merge pull request #2657 from gmaxwell/its_after_may15_foreverJeff Garzik2013-05-305-190/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | It's after 2013-05-15 forever now, so remove the code for the May 15 fork.Gregory Maxwell2013-05-165-190/+0
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2697 from Michagogo/masterWladimir J. van der Laan2013-05-301-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Made more generic by removing specific version referencesMichagogo2013-05-301-5/+5
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2671 from bytemaster/masterPieter Wuille2013-05-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix memory leak on exception in Key::SignCompactDaniel Larimer2013-05-191-0/+3
| * | | | | | | | | | | | fix memory leak in CKey::SetCompactSignature()Daniel Larimer2013-05-191-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2713 from sipa/zerodotninePieter Wuille2013-05-292-80/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prepare for 0.9 merge windowPieter Wuille2013-05-302-80/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2695 from robbak/init_cpp-explicit_castPieter Wuille2013-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |