aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | remove windows.h from crypter.cpp includesPhilip Kaufmann2013-07-241-3/+0
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2883 from codler/patch-5Gavin Andresen2013-08-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Use existing RPC_INVALID_PARAMETER constantHan Lin Yap2013-08-071-3/+3
* | | | | | | | | | | Merge pull request #2871 from gavinandresen/simplify_maporphanGavin Andresen2013-08-063-70/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Simplify storage of orphan transactionsGavin Andresen2013-08-023-60/+39
| * | | | | | | | | | Revert "Truncate oversize 'tx' messages before relaying/storing."Gavin Andresen2013-08-021-10/+0
* | | | | | | | | | | remove a newline from a string in init.cppPhilip Kaufmann2013-08-063-6/+4
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #2879 from Diapolo/translationsWladimir J. van der Laan2013-08-052-40/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | translations update for Transifex 2013-08-05Philip Kaufmann2013-08-052-40/+59
* | | | | | | | | | | Merge pull request #2849 from petertodd/if-else-elseGavin Andresen2013-08-052-1/+30
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add unittests for multiple ELSEs in a rowPeter Todd2013-07-232-1/+30
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2851 from TheBlueMatt/masterGavin Andresen2013-08-052-8/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix multi-block reorg transaction resurrectionMatt Corallo2013-07-231-3/+3
| * | | | | | | | | | Don't use checkpoints and accept nonstd txn on -regtestMatt Corallo2013-07-232-5/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2857 from Diapolo/compat_cleanupGavin Andresen2013-08-051-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cleanup compat.h Windows stuffPhilip Kaufmann2013-07-241-4/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2855 from Diapolo/guard_CreatePidFileGavin Andresen2013-08-053-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | exclude CreatePidFile() function on WIN32 as it is unusedPhilip Kaufmann2013-07-243-1/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2827 from Diapolo/rpccon_winposGavin Andresen2013-08-055-30/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bitcoin-Qt: save and restore position of debug windowPhilip Kaufmann2013-07-295-30/+34
* | | | | | | | | | | Merge pull request #2865 from Diapolo/fix_intro_translationGavin Andresen2013-08-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix string in intro.cpp, which is untranslatable on TransifexPhilip Kaufmann2013-07-291-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2850 from Diapolo/fix_introWladimir J. van der Laan2013-07-312-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix possible infinite loop in intro.cpp threadPhilip Kaufmann2013-07-262-1/+10
* | | | | | | | | | | Move internal miner/block creation to separate miner.cpp module.Jeff Garzik2013-07-3111-668/+698
* | | | | | | | | | | Minor miner fixes (hey hey it's fun to say)Jeff Garzik2013-07-312-2/+2
* | | | | | | | | | | Remove #define loop from util.hGavin Andresen2013-07-3113-23/+17
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Make sure new wallet variables are initializedPieter Wuille2013-07-291-0/+4
* | | | | | | | | | Merge pull request #2541 from luke-jr/bugfix_wallet_resendPieter Wuille2013-07-282-7/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bugfix: Store last/next wallet resend times unique per CWallet objectLuke Dashjr2013-07-172-7/+8
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2702 from vinniefalco/leveldb-subtree-at-1-10-0Pieter Wuille2013-07-2818-59/+190
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashedVinnie Falco2013-07-0118-59/+190
* | | | | | | | | | Merge pull request #2847 from Diapolo/fix_QApplication_includeWladimir J. van der Laan2013-07-257-12/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bitcoin-Qt: fix QApplication includes to match our include defaultsPhilip Kaufmann2013-07-237-12/+13
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2848 from Diapolo/translationsWladimir J. van der Laan2013-07-251-4/+98
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update bitcoin_en.ts to current master (2013-07-23)Philip Kaufmann2013-07-231-4/+98
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1889 from tcatm/multi-walletGavin Andresen2013-07-243-6/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | let user select wallet file with -wallet=foo.datNils Schneider2013-07-043-6/+15
* | | | | | | | | | Merge pull request #2795 from fanquake/log_aborted_rebuildsJeff Garzik2013-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Log aborted block database rebuildsMichael Ford2013-06-251-0/+1
* | | | | | | | | | | Merge pull request #2832 from luke-jr/bugfix_wdb_boostverJeff Garzik2013-07-222-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bugfix: Move boost/version include from db.cpp to walletdb.cpp where BOOST_VE...Luke Dashjr2013-07-152-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2826 from Diapolo/fix_mingw481Jeff Garzik2013-07-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix invalid conversion error with MinGW 4.8.1 in net.cppPhilip Kaufmann2013-07-131-0/+4
* | | | | | | | | | | | Merge pull request #2836 from phelixbtc/patch-3Jeff Garzik2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | makefile.mingw: Use normal boost libraries instead of debug for Windowsphelixbtc2013-07-191-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Bugfix: Include block creation and SSL options headings in usageLuke Dashjr2013-07-211-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2670 from laanwj/2013_05_datadirWladimir J. van der Laan2013-07-185-41/+665
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | qt: allow user to choose data directoryWladimir J. van der Laan2013-06-165-41/+665
* | | | | | | | | | | Fix minor backward incompatibilityPieter Wuille2013-07-131-2/+3
| |/ / / / / / / / / |/| | | | | | | | |