aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bugfix_CNBerr' of git://github.com/luke-jr/bitcoinGavin Andresen2012-07-261-2/+20
|\
| * Bugfix: getmemorypool: NULL pindexPrev across CreateNewBlock, in case it failsLuke Dashjr2012-05-091-1/+11
| |
| * Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerrLuke Dashjr2012-05-091-1/+9
| |\ | | | | | | | | | | | | Conflicts: rpc.cpp
| | * Bugfix: getwork: NULL pindexPrev across CreateNewBlock, in case it failsLuke Dashjr2012-05-091-1/+9
| | |
* | | Merge pull request #1631 from laanwj/2012_07_translationsupdateWladimir J. van der Laan2012-07-252-29/+583
|\ \ \ | | | | | | | | Update translation messages
| * | | Update translation messagesWladimir J. van der Laan2012-07-262-29/+583
|/ / / | | | | | | | | | | | | - No core strings changed since last time - Re-add line numbers in .ts file as this is marginally easier for translators (see #1227)
* | | Merge pull request #1624 from Diapolo/fix_typo_log_fileWladimir J. van der Laan2012-07-251-2/+2
|\ \ \ | | | | | | | | fix typo "logfile" -> "log file"
| * | | fix typo "logfile" -> "log file"Philip Kaufmann2012-07-231-2/+2
| | | |
* | | | Merge pull request #1630 from fanquake/masterWladimir J. van der Laan2012-07-251-1/+1
|\ \ \ \ | | | | | | | | | | Fix Typo
| * | | | TypoMichael Ford2012-07-261-1/+1
| | | | |
* | | | | Merge pull request #1615 from Diapolo/net_noExtIp_IPv6onlyGregory Maxwell2012-07-251-1/+3
|\ \ \ \ \ | | | | | | | | | | | | do not use external IPv4 discovery, when -onlynet="IPv6"
| * | | | | do not use external IPv4 discovery, when -onlynet="IPv6"Philip Kaufmann2012-07-201-1/+3
| | | | | |
* | | | | | Merge pull request #1628 from glondu/masterGregory Maxwell2012-07-2536-36/+36
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix spelling of successfully
| * | | | | Fix spelling of successfullyStephane Glondu2012-07-2436-36/+36
|/ / / / /
* | | | | Merge pull request #1622 from fanquake/masterWladimir J. van der Laan2012-07-222-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | Fix Typos
| * | | | Typofanquake2012-07-231-1/+1
| | | | |
| * | | | Fix Typofanquake2012-07-231-1/+1
|/ / / /
* | | | Merge pull request #1621 from luke-jr/WinCOPYINGGavin Andresen2012-07-229-10/+10
|\ \ \ \ | | | | | | | | | | Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows
| * | | | Replace all occurances of license.txt with COPYING, including naming the ↵Luke Dashjr2012-07-229-10/+10
|/ / / / | | | | | | | | | | | | file COPYING.txt on Windows
* | | | Merge pull request #1616 from Diapolo/OpenSSL_typoJeff Garzik2012-07-212-4/+4
|\ \ \ \ | |/ / / |/| | | fix OpenSSL not written as proper noun in some comments
| * | | fix OpenSSL not written as proper noun in some commentsPhilip Kaufmann2012-07-212-4/+4
|/ / /
* | | Merge pull request #1611 from Diapolo/addressbookpage_sizeWladimir J. van der Laan2012-07-191-2/+2
|\ \ \ | | | | | | | | re-size addressbookpage.ui to fix #1062
| * | | re-size addressbookpage.ui to fix #1062Philip Kaufmann2012-07-191-2/+2
|/ / /
* | | Merge pull request #1610 from fanquake/masterJeff Garzik2012-07-181-1/+1
|\ \ \ | | | | | | | | Update a link to dev resources
| * | | Update a linkfanquake2012-07-191-1/+1
| | | |
* | | | Merge pull request #1609 from fanquake/masterJeff Garzik2012-07-1811-23/+24
|\| | | | | | | | | | | Docs tidy up + fixes
| * | | Docs Tidy upfanquake2012-07-1811-23/+24
| | | |
* | | | Merge pull request #1608 from runeksvendsen/masterGregory Maxwell2012-07-181-1/+1
|\ \ \ \ | |/ / / |/| | | Update the comment in GetBlockValue() to better reflect the uncertainty about the time interval between subsidy reductions
| * | | Let the comment in GetBlockValue() reflect the uncertainty about the time ↵Rune K. Svendsen2012-07-181-1/+1
| | | | | | | | | | | | | | | | interval between subsidy reductions
* | | | Merge pull request #1563 from Diapolo/pro-fileWladimir J. van der Laan2012-07-181-1/+1
|\ \ \ \ | |/ / / |/| | | update Boost version to 1.49 for Windows in the Qt project file
| * | | update Boost version to 1.49 for Windows in the Qt project filePhilip Kaufmann2012-07-061-1/+1
| | | | | | | | | | | | | | | | - add -s flag as we also use a static build in makefile.mingw
* | | | Merge pull request #1605 from laanwj/2012_07_caseinsensitivesortWladimir J. van der Laan2012-07-172-0/+4
|\ \ \ \ | | | | | | | | | | Make sort and filters for transactions and labels case-insensitive
| * | | | Make sort and filters for transactions and labels case-insensitiveWladimir J. van der Laan2012-07-172-0/+4
| | | | |
* | | | | Merge branch 'master' of git://github.com/fanquake/bitcoinGavin Andresen2012-07-171-2/+2
|\ \ \ \ \
| * | | | | Correct OpenSSL in makefilefanquake2012-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 1.0.0d -> 1.0.1b
* | | | | | New feature for signrawtransaction: specify signature hash (ALL/NONE/etc)Gavin Andresen2012-07-171-3/+24
| | | | | |
* | | | | | Give a better error message than 'type mismatch' for complex JSON argumentsGavin Andresen2012-07-171-2/+3
| | | | | |
* | | | | | Merge pull request #1604 from Diapolo/fix_comment_netWladimir J. van der Laan2012-07-171-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fix a comment in net.cpp
| * | | | | fix a comment in net.cppPhilip Kaufmann2012-07-171-1/+1
| | | | | |
* | | | | | Merge pull request #1564 from Diapolo/IPC-serverWladimir J. van der Laan2012-07-174-38/+74
|\ \ \ \ \ \ | |/ / / / / |/| | | | | IPC-server hardening and update
| * | | | | IPC-server hardening and updatePhilip Kaufmann2012-07-174-38/+74
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add IMPLEMENT_RANDOMIZE_STACK for ipcThread() - log / print boost interprocess exceptions - use MAX_URI_LENGTH in guiconstants.h (also used in qrcodedialog.cpp) - remove unneeded includes and ipcShutdown() from qtipcserver.cpp - fix a small mem-leak by deleting mq before re-using it - make ipcThread() and ipcThread2() static functions - add some more comments
* | | | | Merge pull request #1591 from Diapolo/lang_sel_Qt4.8Wladimir J. van der Laan2012-07-161-0/+10
|\ \ \ \ \ | | | | | | | | | | | | enhance lang-selection in OptionsDialog, when compiling with Qt >= 4.8
| * | | | | enhance lang-selection in OptionsDialog, when compiling with Qt >= 4.8Philip Kaufmann2012-07-131-0/+10
| | | | | |
* | | | | | Merge branch 'fix-commandline-warnings' of git://github.com/muggenhor/bitcoinGavin Andresen2012-07-161-4/+9
|\ \ \ \ \ \
| * | | | | | Use linker-arguments only when linkingGiel van Schijndel2012-07-171-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing linker-arguments when only compiling will cause warnings with Clang. This change fixes those. Signed-off-by: Giel van Schijndel <[email protected]>
* | | | | | | Teach RenameThread to work on OSXGavin Andresen2012-07-161-0/+2
| | | | | | |
* | | | | | | Give the GUI-IPC thread a name as wellGiel van Schijndel2012-07-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giel van Schijndel <[email protected]>
* | | | | | | Don't check for __linux__ specifically, check for PR_SET_NAME feature insteadGiel van Schijndel2012-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giel van Schijndel <[email protected]>
* | | | | | | Add support for renaming FreeBSD and OpenBSD threadsGiel van Schijndel2012-07-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: This is currently disabled, until a developer with FreeBSD/OpenBSD can confirm that this works (without causing undefined behaviour preferrably). Signed-off-by: Giel van Schijndel <[email protected]>
* | | | | | | Fix thread names after reviewGiel van Schijndel2012-07-173-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix wrong thread name for wallet *relocking* thread - Was named the unlocking thread * Use consistent naming Signed-off-by: Giel van Schijndel <[email protected]>