aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #1237 from gmaxwell/masterJeff Garzik2012-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Kill warning from unavoidable signed/unsigned comparison in bitcoinrpc.cpp.Gregory Maxwell2012-05-091-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1134 from Diapolo/util-updatesJeff Garzik2012-05-092-44/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | util.h/.ccp: modifiy some comments / rename MyGetSpecialFolderPath() -> GetSp...Philip Kaufmann2012-05-092-44/+32
* | | | | | | | | | | Merge pull request #1225 from Diapolo/net_cpp_if_clauseJeff Garzik2012-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix an incorrect if-clause in net.cppPhilip Kaufmann2012-05-091-1/+1
* | | | | | | | | | | Merge pull request #1230 from sipa/warningsGregory Maxwell2012-05-0913-26/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clean up warningsPieter Wuille2012-05-0913-26/+24
* | | | | | | | | | | | Merge pull request #1235 from Diapolo/translation_enWladimir J. van der Laan2012-05-091-318/+458
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update bitcoin_en.ts (translation master file) to match current master branch...Philip Kaufmann2012-05-091-318/+458
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1232 from TheBlueMatt/lockcontentionGregory Maxwell2012-05-091-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix DEBUG_LOCKCONTENTIONMatt Corallo2012-05-091-1/+3
* | | | | | | | | | | | Merge pull request #1211 from Diapolo/harmonize_ellipsisWladimir J. van der Laan2012-05-095-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | harmonize the use of ellipsis ("...") to be used in menus, but not on buttons...Philip Kaufmann2012-05-095-9/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1215 from laanwj/2012_05_nogridtablesWladimir J. van der Laan2012-05-082-10/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make user action more straightforward in address bookWladimir J. van der Laan2012-05-072-10/+25
* | | | | | | | | | | Merge pull request #1221 from Diapolo/optionsdialogWladimir J. van der Laan2012-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | remove 2 ugly spaces from a string used in translationsPhilip Kaufmann2012-05-091-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Revert part of 1302257e: don't update CXXFLAGS, only xCXXFLAGSJeff Garzik2012-05-081-1/+1
* | | | | | | | | | makefile.unix: add -Wall to default CXXFLAGSJeff Garzik2012-05-081-2/+2
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'tmp-ipv6' into merge-ipv6Jeff Garzik2012-05-089-183/+558
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added -externalip and -discoverPieter Wuille2012-05-043-22/+47
| * | | | | | | | | Support for multiple local addressesPieter Wuille2012-05-048-88/+187
| * | | | | | | | | Add -seednode connections, and use this for -dnsseed + -proxydnsPieter Wuille2012-05-044-9/+45
| * | | | | | | | | Support connecting by hostnames passed to proxy (-proxydns)Pieter Wuille2012-05-045-69/+145
| * | | | | | | | | refactor ConnectSocketPieter Wuille2012-05-041-9/+25
| * | | | | | | | | SOCKS5 connect via hostnamePieter Wuille2012-05-041-26/+9
| * | | | | | | | | SOCKS5 support by defaultPieter Wuille2012-05-042-29/+169
| |/ / / / / / / /
* | | | | | | | | Merge pull request #886 from luke-jr/getblock_fullGregory Maxwell2012-05-081-25/+199
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support for decomposing scripts as "obj"Luke Dashjr2012-05-081-0/+74
| * | | | | | | | | Second parameter to JSON-RPC getblock/gettransaction: decompositionsLuke Dashjr2012-05-081-25/+122
| * | | | | | | | | Add block "confirmations" to getblock, mainly for identifying orphansLuke Dashjr2012-05-081-0/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1226 from Diapolo/init_h_rem_obsoleteJeff Garzik2012-05-081-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | remove 2 obsolete functions from init.h that moved to util.hPhilip Kaufmann2012-05-081-3/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #1180 from jgarzik/sign-compareJeff Garzik2012-05-084-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | EvalScript(): cast to avoid signed/unsigned warningJeff Garzik2012-05-011-3/+3
| * | | | | | | | ThreadSocketHandler2(): cast to avoid signed/unsigned warningJeff Garzik2012-05-011-1/+1
| * | | | | | | | OpenBlockFile(): cast to eliminate signed/unsigned comparison warningJeff Garzik2012-05-011-1/+1
| * | | | | | | | CDiskTxPos, CInPoint, COutPoint: cast null value (-1) to unsigned intJeff Garzik2012-05-011-6/+6
* | | | | | | | | Merge pull request #841 from sipa/getalltransactionsGregory Maxwell2012-05-083-16/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gettransaction RPC for non-wallet transactionsPieter Wuille2012-04-183-16/+107
* | | | | | | | | | Merge pull request #883 from sipa/loadblockGregory Maxwell2012-05-084-3/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | -loadblock to load from an external blk000?.dat filePieter Wuille2012-04-224-3/+72
* | | | | | | | | | | Merge pull request #1075 from laanwj/2012_04_consoleuiGregory Maxwell2012-05-0810-79/+833
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add UI RPC console / debug windowWladimir J. van der Laan2012-05-0510-79/+833
* | | | | | | | | | | | Increase client version to 0.6.99Gregory Maxwell2012-05-085-8/+8
* | | | | | | | | | | | Merge pull request #1219 from luke-jr/rm_fee_tipWladimir J. van der Laan2012-05-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bitcoin-Qt: Remove redundant tooltip on optional transaction fee. Fixes #1218Luke Dashjr2012-05-071-1/+0
* | | | | | | | | | | | | Merge pull request #1214 from TheBlueMatt/debianJeff Garzik2012-05-061-4/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update changelog to match reality.Matt Corallo2012-05-061-4/+34