aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'BDB_DOWNGRADE'Gavin Andresen2012-10-082-15/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Handle incompatible BDB environmentsGavin Andresen2012-10-082-15/+19
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1859 from Diapolo/proxy_locksPieter Wuille2012-10-075-49/+77
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | add LOCK() for proxy related data-structuresPhilip Kaufmann2012-10-045-49/+77
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1906 from laanwj/2012_10_help_stdoutWladimir J. van der Laan2012-10-052-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Send --help message to stdout i.s.o stderrWladimir J. van der Laan2012-10-042-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #1905 from laanwj/2012_10_startup_gui_errorWladimir J. van der Laan2012-10-041-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | When datadir missing, show messagebox instead of printing error to stderrWladimir J. van der Laan2012-10-041-1/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #1908 from laanwj/2012_10_rpcerrorsPieter Wuille2012-10-047-112/+159
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add constants for HTTP status codesWladimir J. van der Laan2012-10-042-17/+28
| * | | | | | | Document RPC error codesWladimir J. van der Laan2012-10-047-97/+133
| |/ / / / / /
* | | | | | | Merge pull request #1907 from laanwj/2012_10_translationsWladimir J. van der Laan2012-10-0412-446/+494
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Pull changed translations from transifexWladimir J. van der Laan2012-10-049-318/+323
| * | | | | | Translation update for 0.7.1Wladimir J. van der Laan2012-10-043-128/+171
|/ / / / / /
* | | | | | Merge branch '2012_09_fixwformat' of github.com:laanwj/bitcoinGavin Andresen2012-10-0115-39/+49
|\ \ \ \ \ \
| * | | | | | Revert "Remove -Wformat* warnings from makefiles"Wladimir J. van der Laan2012-10-015-5/+5
| * | | | | | fix -Wformat warnings all over the sourcePhilip Kaufmann2012-10-019-32/+32
| * | | | | | Extend printf warnings to error()Wladimir J. van der Laan2012-10-011-2/+12
* | | | | | | Merge branch 'master' of github.com:runeksvendsen/bitcoinGavin Andresen2012-10-011-1/+10
|\ \ \ \ \ \ \
| * | | | | | | When encrypting the wallet, warn user that old backups will become useless.Rune K. Svendsen2012-09-301-1/+10
* | | | | | | | Merge pull request #1893 from kjj2/issue1884Gavin Andresen2012-10-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a backup warning to the encryptwallet RPC commandkjj22012-09-301-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '2012_09_base58tests' of github.com:laanwj/bitcoinGavin Andresen2012-10-017-64/+1085
|\ \ \ \ \ \ \ \
| * | | | | | | | data-driven base58 CBitcoinAddress/CBitcoinSecret testsWladimir J. van der Laan2012-10-017-64/+1085
* | | | | | | | | Merge pull request #1886 from Diapolo/fix_Win_URI_assocWladimir J. van der Laan2012-09-301-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Windows: fix URI association setting in registryPhilip Kaufmann2012-09-291-1/+1
* | | | | | | | | Merge pull request #1891 from Diapolo/printf_format_defsWladimir J. van der Laan2012-09-301-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | harmonize printf format charactersPhilip Kaufmann2012-09-301-6/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #1875 from hsoft/masterWladimir J. van der Laan2012-09-291-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed compilation error with clang.Virgil Dupras2012-09-271-2/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #1881 from xanatos/TestsWladimir J. van der Laan2012-09-291-7/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | toHTML won't add empty wtx.mapValue elementsxanatos2012-09-281-7/+6
* | | | | | | | | Merge pull request #1864 from Diapolo/Qt_4.8.2Wladimir J. van der Laan2012-09-294-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | switch to Qt 4.8.2 for Windows buildsPhilip Kaufmann2012-09-254-9/+9
* | | | | | | | | | Merge pull request #1851 from fanquake/OpenSSL-1.0.1cWladimir J. van der Laan2012-09-298-25/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Bitcoin to use OpenSSL 1.0.1cfanquake2012-09-228-25/+25
* | | | | | | | | | | Merge pull request #1883 from sipa/norandstackWladimir J. van der Laan2012-09-295-36/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove stack randomizationPieter Wuille2012-09-285-36/+0
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1871 from jgarzik/wallet-deadcodeJeff Garzik2012-09-281-30/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | walletdb.h: remove dead codeJeff Garzik2012-09-261-30/+0
* | | | | | | | | | | Merge pull request #1862 from kjj2/testportsPieter Wuille2012-09-282-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix: when testnet=1 specified, change default ports to 18332 and 18333kjj22012-09-242-3/+8
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1868 from maaku/and_or_xor_sign_extensionWladimir J. van der Laan2012-09-271-1/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Documented bug in sign-extension behavior of opcodes OP_AND, OP_OR, and OP_XOR.Mark Friedenbach2012-09-251-1/+23
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Remove -Wformat* warnings from makefilesWladimir J. van der Laan2012-09-275-5/+5
* | | | | | | | | Merge pull request #1807 from laanwj/2012_09_printf_warningsWladimir J. van der Laan2012-09-254-21/+64
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add format characters for (s)size_t and ptrdiff_tWladimir J. van der Laan2012-09-101-0/+11
| * | | | | | | | HexStr: don't build a vector<char> firstWladimir J. van der Laan2012-09-104-7/+7
| * | | | | | | | Cleanup some unused macros from util.hWladimir J. van der Laan2012-09-092-5/+4
| * | | | | | | | Add printf-style warnings to strprintf() and OutputDebugStringF()Wladimir J. van der Laan2012-09-092-9/+42