DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
6,111 Commits 6 Branches 7 Tags
3faf1f8294065eaabe2d6d24f2fe04ee4dfd6ae2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 3faf1f8294 test: Fix warning about integer signedness in P2SH tests 2014-06-30 16:37:59 +02:00
Wladimir J. van der Laan 5c184cb850 Merge pull request #4415 
e35b37b RPC client: Simplify command line string-to-JSON-value conversion code (Jeff Garzik)
 2014-06-30 15:56:01 +02:00
Wladimir J. van der Laan 77888d68d5 Fix the build for Qt5 
Merging #3883 broke the Qt5 build, define the color in the standard
way.
 2014-06-30 15:44:55 +02:00
Wladimir J. van der Laan ac26571d2b Merge pull request #4437 
de79aaa Move non-trivial uint256.h methods to uint256.cpp (Pieter Wuille)
 2014-06-30 11:27:46 +02:00
Wladimir J. van der Laan eba8c44fdd Merge pull request #4440 
16f33f1 fix RPC error replies (kazcw)
 2014-06-30 11:25:37 +02:00
Wladimir J. van der Laan a11f648585 Merge pull request #4441 
ffebc1b Update verify.sh script to point to bitcoin.org (Michael Ford)
 2014-06-29 08:49:26 +02:00
Wladimir J. van der Laan 7b8fc9d8ad Merge pull request #4436 
675bcd5 Correct comment for 15-of-15 p2sh script size (Michael Ford)
 2014-06-28 15:09:15 +02:00
Wladimir J. van der Laan c8b6c0a2cf Merge pull request #4425 
6ecf3ed Display unknown commands received. (R E Broadley)
 2014-06-28 15:07:51 +02:00
Wladimir J. van der Laan 9125ef9421 Merge pull request #4398 
86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann)
e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
 2014-06-28 15:06:18 +02:00
Wladimir J. van der Laan 5bc77b2bb2 Merge pull request #4418 
d618965 Add note about PPA to build instructions (Drak)
e5f0247 Simplify build instructions (Drak)
 2014-06-28 15:04:25 +02:00
Wladimir J. van der Laan f62784f961 Merge pull request #4422 
645d497 Replace HexBits with strprintf (jtimon)
 2014-06-28 15:02:03 +02:00
Wladimir J. van der Laan 55b27206d0 Merge pull request #4435 
92ddf2c Update OS X build instructions (Michael Ford)
 2014-06-28 15:00:00 +02:00
Wladimir J. van der Laan ba81f45607 Merge pull request #3990 
0dd5d3a Show only one zero instead of many when getblocks request received with a hashStop of uint256(0) (R E Broadley)
 2014-06-28 10:16:09 +02:00
Wladimir J. van der Laan de9ca93467 Merge pull request #4434 
3f1ea91 doc: Add historical release notes for 0.9.2 (Michael Ford)
 2014-06-28 08:58:14 +02:00
Wladimir J. van der Laan dfaa35d8cd Merge pull request #4430 
33c62c9 set shutdown title to main window title (Philip Kaufmann)
 2014-06-27 18:53:11 +02:00
Wladimir J. van der Laan 4684c883bb Merge pull request #4208 
6a5c124 [Qt] don't allow translation of our example btc address (Philip Kaufmann)
 2014-06-27 12:46:49 +02:00
Wladimir J. van der Laan 3a9d796eb9 Merge pull request #4426 
40a158e minor code format fix in rpc-related files (Philip Kaufmann)
 2014-06-27 12:35:57 +02:00
Wladimir J. van der Laan 49d86c7477 rpc-tests: Fix rpcbind_test after 0193fb8 
Port number for RPC is no longer static as multiple tests could be
running at once.
 2014-06-27 10:06:40 +02:00
Wladimir J. van der Laan d77f761be9 Merge pull request #4288 
ed5769f Move AcceptedConnection class to rpcserver.h. (Jeff Garzik)
854d013 RPC code movement: separate out JSON-RPC execution logic from HTTP server logic (Jeff Garzik)
c912e22 RPC cleanup: Improve HTTP server replies (Jeff Garzik)
 2014-06-27 10:03:19 +02:00
Wladimir J. van der Laan 19168c3377 Merge pull request #4424 
c598f2a Fixed captitalization in bitcoin-cli-res.rc (Whit J)
 2014-06-27 09:34:46 +02:00
Wladimir J. van der Laan 236ae8665e Merge pull request #3715 
e44fea5 Add an option to allow users to disable relaying/mining data carrier transactions (Luke Dashjr)
 2014-06-26 17:31:12 +02:00
Wladimir J. van der Laan eacff4a9c6 Merge pull request #4392 
8ae973c Allocate more space if necessary in RandSeedAddPerfMon (Wladimir J. van der Laan)
be873f6 Issue warning if collecting RandSeed data failed (Wladimir J. van der Laan)
fcb0a1b change "char pch[200000]" to "new char[200000]" (daniel)
 2014-06-26 17:11:53 +02:00
Wladimir J. van der Laan ffb32acfab Merge pull request #1583 
2a72d45 JSON-RPC method: prioritisetransaction <txid> <priority delta> <priority tx fee> (Luke Dashjr)
 2014-06-26 16:20:01 +02:00
Wladimir J. van der Laan f40d193c18 Merge pull request #4414 
a90689f Remove timing-based signature cache unit test (Gavin Andresen)
 2014-06-26 15:18:23 +02:00
Wladimir J. van der Laan 8ae973c00c Allocate more space if necessary in RandSeedAddPerfMon 
Currently we use a fixed buffer of 250000 bytes to request
HKEY_PERFORMANCE_DATA. In many cases this is not enough, causing the
entropy collection to be skipped.

Use a loop that grows the buffer as specified in the RegQueryValueEx
documentation:
http://msdn.microsoft.com/en-us/library/windows/desktop/ms724911%28v=vs.85%29.aspx

(as the size of the performance data can differ for every call, the
normal solution of requesting the size then allocating that can't work)
 2014-06-26 15:15:17 +02:00
Wladimir J. van der Laan 343feecf56 Merge pull request #4368 
75c82d4 Move coins.cpp and keystore.cpp to libbitcoin_common (Wladimir J. van der Laan)
84ce18c Remove unnecessary dependencies for bitcoin-cli (Wladimir J. van der Laan)
14f888c Move network-time related functions to timedata.cpp/h (Wladimir J. van der Laan)
 2014-06-25 17:00:09 +02:00
Wladimir J. van der Laan 75c82d4923 Move coins.cpp and keystore.cpp to libbitcoin_common 
Prepare for introduction of `bitcoin-tx` tool.
 2014-06-25 10:31:35 +02:00
Wladimir J. van der Laan 84ce18ca93 Remove unnecessary dependencies for bitcoin-cli 
This commit removes all the unnecessary dependencies (key, core,
netbase, sync, ...) from bitcoin-cli.

To do this it shards the chain parameters into BaseParams, which
contains just the RPC port and data directory (as used by utils and
bitcoin-cli) and Params, with the rest.
 2014-06-25 10:31:35 +02:00
Wladimir J. van der Laan 14f888ca80 Move network-time related functions to timedata.cpp/h 
The network time-offset-mangement functions from util.cpp are moved to
timedata.(cpp|h). This breaks the dependency of util on netbase.
 2014-06-25 09:24:50 +02:00
Wladimir J. van der Laan 208bf5b9e0 Merge pull request #3839 
fd704c7 move pow constants to chainparams (jtimon)
df852d2 Refactor proof of work related functions out of main (jtimon)
 2014-06-25 09:14:36 +02:00
Wladimir J. van der Laan 27383b9015 Merge pull request #4390 
6dc90ed replace 3 separate calls to WSAGetLastError() with 1 (Philip Kaufmann)
 2014-06-25 07:20:42 +02:00
Wladimir J. van der Laan e6cb20e19a Merge pull request #4404 
e9f2460 Add dependencies for Mac OSX gitian builds (Drak)
 2014-06-25 07:13:28 +02:00
Wladimir J. van der Laan ea37a208de Merge pull request #4406 
b79f59b Update .gitignore (Drak)
 2014-06-25 07:07:27 +02:00
Wladimir J. van der Laan fcbb1a74db Merge pull request #4408 
e3aedba Consistent lettering (Whit J)
 2014-06-25 07:07:04 +02:00
Wladimir J. van der Laan 6e8472ec7c Merge pull request #4403 
5fbb4c9 [Qt] fix links in about window not opening (Philip Kaufmann)
 2014-06-24 18:07:45 +02:00
Wladimir J. van der Laan 0410d11b3a Merge pull request #4130 
1c750db remove -tor compatibility code (only allow -onion) (Philip Kaufmann)
 2014-06-24 17:51:32 +02:00
Wladimir J. van der Laan 5dd0bfefcb Merge pull request #4169 
0655fac miner: indentation fixes, remove for (;;) (Philip Kaufmann)
 2014-06-24 17:17:13 +02:00
Wladimir J. van der Laan d4392c8989 Merge pull request #3674 
77cbd46 Let -zapwallettxes recover transaction meta data (Cozz Lovan)
 2014-06-24 17:04:52 +02:00
Wladimir J. van der Laan 36db6633c3 Merge pull request #4395 
f3967bc build: fix build weirdness after 54372482. (Cory Fields)
 2014-06-23 20:26:12 +02:00
Wladimir J. van der Laan 3b1295e988 qa/rpc_tests: Wait for handshake to complete in connect_nodes 
This avoids a race condition in which the connection was
made but the version handshake is not completed yet. In that
case transactions won't be broadcasted to a peer yet, and
the nodes will wait forever for their mempools to sync.
 2014-06-23 17:43:55 +02:00
Wladimir J. van der Laan 0869df195c Merge pull request #3960 
3f9a019 added list/get received by address/ account tests (Alon Muroch)
 2014-06-23 17:37:40 +02:00
Wladimir J. van der Laan be873f6454 Issue warning if collecting RandSeed data failed 2014-06-23 16:29:51 +02:00
Wladimir J. van der Laan a652787737 Merge pull request #4314 
b3c912d [Qt] Change Coin control labels and tooltips because of non-rounding fees (Cozz Lovan)
 2014-06-23 12:07:50 +02:00
Wladimir J. van der Laan 17db9767c4 doc: Remove unused section from release-process.md 
It is outdated information. If we ever resurrect gitian-downloader it
can be brought back from history and updated.
 2014-06-23 12:04:33 +02:00
Wladimir J. van der Laan 5459116d61 Merge pull request #4293 
fa126ef Avoid undefined behavior using CFlatData in CScript serialization (Wladimir J. van der Laan)
 2014-06-23 10:44:57 +02:00
Wladimir J. van der Laan fa126effc2 Avoid undefined behavior using CFlatData in CScript serialization 
`&vch[vch.size()]` and even `&vch[0]` on vectors can cause assertion
errors with VC in debug mode. This is the problem mentioned in #4239.
The deeper problem with this is that we rely on undefined behavior.

- Add `begin_ptr` and `end_ptr` functions that get the beginning and end
  pointer of vector in a reliable way that copes with empty vectors and
  doesn't reference outside the vector
(see https://stackoverflow.com/questions/1339470/how-to-get-the-address-of-the-stdvector-buffer-start-most-elegantly/1339767#1339767).
- Add a convenience constructor to CFlatData that wraps a vector.

I added `begin_ptr` and `end_ptr` as separate functions as I imagine
they will be useful in more places.
 2014-06-23 10:38:15 +02:00
Wladimir J. van der Laan 52d4abfdef Merge pull request #4388 
3dc1464 add missing vhListenSocket.clear(); to CNetCleanup() (Philip Kaufmann)
2831a03 remove unused CNode::Cleanup() (Philip Kaufmann)
 2014-06-23 10:21:38 +02:00
Wladimir J. van der Laan bfb55dd586 Merge pull request #4385 
040c2d3 Fix formatting (Drak)
 2014-06-23 10:21:20 +02:00
Wladimir J. van der Laan 82f2bba1ad Merge pull request #4391 
b612bde remove unneded class CNodeCombinedStats; from rpcconsole.cpp (Philip Kaufmann)
 2014-06-23 10:01:07 +02:00
Wladimir J. van der Laan 540ce6aa10 Merge pull request #4380 
38405ac Add comment regarding experimental-use service bits (Peter Todd)
99ddc6c Add nLocalServices info to RPC getinfo (Peter Todd)
 2014-06-21 19:26:18 +02:00
Wladimir J. van der Laan aaacfa0898 Merge pull request #4371 
ea3acaf AvailableCoins: acquire cs_main mutex (Pavel Vasin)
 2014-06-20 16:57:08 +02:00
Wladimir J. van der Laan b8b98d5642 Merge pull request #4310 
7a9e0b6 Move checkpoint based heuristic checks to AcceptBlockHeader (Pieter Wuille)
 2014-06-19 14:38:45 +02:00
Wladimir J. van der Laan 7eb49c79f0 Merge pull request #4358 
6afa493 rpc: Add acceptors only when listening succeeded (Wladimir J. van der Laan)
33e5b42 rpc: Ignore and log errors during cancel (Wladimir J. van der Laan)
 2014-06-19 09:34:42 +02:00
Wladimir J. van der Laan 6afa49329d rpc: Add acceptors only when listening succeeded 2014-06-19 08:19:52 +02:00
Wladimir J. van der Laan 33e5b42910 rpc: Ignore and log errors during cancel 
Cancelling the RPC acceptors can sometimes result in an error about
a bad file descriptor.

As this is the shutdown sequence we need to continue nevertheless,
ignore these errors, log a warning and proceed.

Fixes #4352.
 2014-06-19 08:19:46 +02:00
Wladimir J. van der Laan 9fe80a2ec8 Merge pull request #4334 
6763018 [Qt] rename In:/Out: to Received/Sent in traffic tab (Philip Kaufmann)
 2014-06-18 09:59:47 +02:00
Wladimir J. van der Laan b8e56aa8ef Merge pull request #4339 
92a6220 sanity: hook up sanity checks (Cory Fields)
679240d sanity: add libc/stdlib sanity checks (Cory Fields)
11404af sanity: autoconf check for sys/select.h (Cory Fields)
 2014-06-18 09:52:50 +02:00
Wladimir J. van der Laan 5a514c35bc Merge pull request #4354 
7ad720d Added encryptwallet call to bitrpc.py (dllud)
 2014-06-18 09:17:20 +02:00
Wladimir J. van der Laan 5694d10781 Merge pull request #4346 
1569353 Add `-stopafterblockimport` option (Wladimir J. van der Laan)
 2014-06-17 14:51:15 +02:00
Wladimir J. van der Laan 2151419b1b Merge pull request #4333 
f6984e8 Add "chain" to getmininginfo, improve help in getblockchaininfo (jtimon)
b82b7ec Get rid of Params().RPCisTestNet() (jtimon)
 2014-06-17 14:11:28 +02:00
Wladimir J. van der Laan e164828105 Merge pull request #4357 
1020f59 add comment to HelpMessage() to ensure alphabetical ordering (Philip Kaufmann)
 2014-06-17 09:20:40 +02:00
Wladimir J. van der Laan 529047fcd1 Merge pull request #4349 
09eb201 Remove `using namespace std` from header file (Wladimir J. van der Laan)
 2014-06-16 17:54:12 +02:00
Wladimir J. van der Laan 09eb201b1b Remove using namespace std from header file 
It's considered bad form to import things into the global namespace in a
header. Put it in the cpp files where it is needed instead.
 2014-06-16 17:42:54 +02:00
Wladimir J. van der Laan 807691ca96 Merge pull request #4326 
f5ae6c9 add NetworkIDString() to chainparams (Philip Kaufmann)
 2014-06-16 17:41:27 +02:00
Wladimir J. van der Laan f73082db87 Merge pull request #4337 
88df548 base58: add paranoid return value checks (Jeff Garzik)
 2014-06-16 17:29:43 +02:00
Wladimir J. van der Laan 1569353b8a Add -stopafterblockimport option 
Stop after importing blocks. This can be useful for development
and trouble shooting.
 2014-06-16 11:47:32 +02:00
Wladimir J. van der Laan 0075337020 Merge pull request #4232 
b750cf1 Remove cli functionality from bitcoind (Wladimir J. van der Laan)
 2014-06-15 15:43:47 +02:00
Wladimir J. van der Laan b750cf1fb9 Remove cli functionality from bitcoind 
As it says on the tin. It was deprecated in version 0.9, and
at some point it should be removed.

Removes the dependency of bitcoind on libbitcoin-cli.a. Move
some functions that used to be shared but are now only used in
bitcoin-cli.cpp to that file.

After this change, an error is printed (and exit code 1 is returned)
when the user tries to send RPC commands using bitcoind.
 2014-06-15 15:38:22 +02:00
Wladimir J. van der Laan 8615bfb486 Merge pull request #4316 
18116b0 Ignore too-long redeemScripts while loading wallet (Wladimir J. van der Laan)
 2014-06-14 11:32:03 +02:00
Wladimir J. van der Laan 8047fb04ed Merge pull request #4193 
71aaff3 Remove double-dash parameters from mapArgs (Kosta Zertsekel)
 2014-06-12 16:47:48 +02:00
Wladimir J. van der Laan fe1f417287 Merge pull request #4281 
5c97aae qt: Unify AboutDialog and HelpMessageDialog (Wladimir J. van der Laan)
45615af Add 'about' information to `-version` output (Wladimir J. van der Laan)
97789d3 util: Add function FormatParagraph to format paragraph to fixed-width (Wladimir J. van der Laan)
96b733e Add `-version` option to get just the version (Wladimir J. van der Laan)
 2014-06-12 16:42:55 +02:00
Wladimir J. van der Laan 5c97aae6da qt: Unify AboutDialog and HelpMessageDialog 
They share so much code and functionality that they may as well
be one class.
 2014-06-12 16:11:56 +02:00
Wladimir J. van der Laan 45615af26f Add 'about' information to -version output 
Adds a copyright and attribution message to the `-version` output
(the same as shown in the About dialog in the GUI).

Move the message to a function LicenseInfo in init.cpp.
 2014-06-12 16:11:56 +02:00
Wladimir J. van der Laan 18116b06c1 Ignore too-long redeemScripts while loading wallet 
This avoids that long redeemScripts that were grandfathered in
prevent the wallet from loading.

Fixes #4313.
 2014-06-12 15:28:41 +02:00
Wladimir J. van der Laan e5ee8f016e Remove -beta suffix 
It conflicts with our normal naming of releases/builds. Fixes #4221.
 2014-06-12 13:52:15 +02:00
Wladimir J. van der Laan 3f39b9d455 Merge pull request #2784 
f1920e8 Ping automatically every 2 minutes (unconditionally) (Pieter Wuille)
 2014-06-12 12:40:09 +02:00
Wladimir J. van der Laan 9a876f5566 Merge pull request #4330 
c30329a Add testnet DNS seed of Alex Kotenko. (Andreas Schildbach)
 2014-06-12 12:34:10 +02:00
Wladimir J. van der Laan 4800ccb823 Merge pull request #4328 
f379047 remove unused code from getblockchaininfo() (Philip Kaufmann)
 2014-06-11 15:14:35 +02:00
Wladimir J. van der Laan 97789d374c util: Add function FormatParagraph to format paragraph to fixed-width 
This is to be used for the `-version` and `-help` messages.
 2014-06-11 14:27:09 +02:00
Wladimir J. van der Laan 96b733e996 Add -version option to get just the version 
Adds a `-version` or `--version` option to print just the version
of the program for bitcoind, bitcoin-cli and bitcoin-qt.

Also make it that `-help` can be used to display the help (as well as
existing `--help`). Up to now, `-help` was the only option that didn't
work with either one or two dashes.
 2014-06-11 14:22:50 +02:00
Wladimir J. van der Laan 9c8d2f6df0 Merge pull request #4227 
634bd61 convert an if into an else if in OpenNetworkConnection() (Philip Kaufmann)
5bd6c31 small cleanup of net (Philip Kaufmann)
 2014-06-11 13:01:11 +02:00
Wladimir J. van der Laan 0cadf620f6 Merge pull request #4290 
56b07d2 [Qt] allow setting listen via GUI (Philip Kaufmann)
 2014-06-11 12:16:41 +02:00
Wladimir J. van der Laan 5905d71fe3 Merge pull request #4170 
ac14bcc small formatting, indentation and comment fixes (Philip Kaufmann)
 2014-06-11 11:31:00 +02:00
Wladimir J. van der Laan d01574f792 Merge pull request #4277 
4a09e1d key.cpp: fail with a friendlier message on missing ssl EC support (Andrew Poelstra)
 2014-06-11 08:34:25 +02:00
Wladimir J. van der Laan 4e45932659 Merge pull request #4321 
699fe63 remove wrong ; in chainparams.h and order includes (Philip Kaufmann)
 2014-06-11 08:26:20 +02:00
Wladimir J. van der Laan ec7be4a11c Merge pull request #4322 
77a055d build: Add a top-level forwarding target for src/* objects (Cory Fields)
 2014-06-11 08:25:55 +02:00
Wladimir J. van der Laan 40c3781365 Merge pull request #4323 
38e324a build: qt: split locale resources. Fixes non-deterministic distcheck (Cory Fields)
 2014-06-11 08:16:23 +02:00
Wladimir J. van der Laan 4f106a3fa6 Merge pull request #4319 
1c24187 remove unused UPnP code from main.h (Philip Kaufmann)
 2014-06-11 08:10:33 +02:00
Wladimir J. van der Laan d32c8bea96 Merge pull request #4317 
68ba85f Updated Debian example bitcoin.conf with config from wiki + removed some cruft and updated comments (Giuseppe Mazzotta)
 2014-06-11 08:00:54 +02:00
Wladimir J. van der Laan 6dd5edb7de Remove unused Print/PrintHex functions 
You can just use HexStr(script) or script.ToString() for debugging, no
need for these extra functions.
 2014-06-10 15:03:21 +02:00
Wladimir J. van der Laan 588fb4e82f Merge pull request #4305 
95a9383 [Qt] Remove CENT-fee-rule from coin control completely (Cozz Lovan)
 2014-06-10 10:42:42 +02:00
Wladimir J. van der Laan 6741837233 Merge pull request #4300 
dff0e3b [Qt] Improve rpc console history behavior (Cozz Lovan)
 2014-06-09 12:58:56 +02:00
Wladimir J. van der Laan 62fdf381fa Merge pull request #3824 
f0a83fc Use Params().NetworkID() instead of TestNet() from the payment protocol (jtimon)
2871889 net.h was using std namespace through chainparams.h included in protocol.h (jtimon)
c8c52de Replace virtual methods with static attributes, chainparams.h depends on protocol.h instead of the other way around (jtimon)
a3d946e Get rid of TestNet() (jtimon)
6fc0fa6 Add RPCisTestNet chain parameter (jtimon)
cfeb823 Add RequireStandard chain parameter (jtimon)
21913a9 Add AllowMinDifficultyBlocks chain parameter (jtimon)
d754f34 Move majority constants to chainparams (jtimon)
8d26721 Get rid of RegTest() (jtimon)
cb9bd83 Add DefaultCheckMemPool chain parameter (jtimon)
2595b9a Add DefaultMinerThreads chain parameter (jtimon)
bfa9a1a Add MineBlocksOnDemand chain parameter (jtimon)
1712adb Add MiningRequiresPeers chain parameter (jtimon)
 2014-06-09 12:52:29 +02:00
Wladimir J. van der Laan 07b233a1b6 Merge pull request #4148 
18e7216 Push cs_mains down in ProcessBlock (Pieter Wuille)
202e019 Move all post-chaintip-change notifications to ActivateBestChain (Pieter Wuille)
4e0eed8 Allow ActivateBestChain to release its lock on cs_main (Pieter Wuille)
77339e5 Get rid of the static chainMostWork (optimization) (Pieter Wuille)
 2014-06-09 12:17:12 +02:00
Wladimir J. van der Laan 6ff35a0565 Merge pull request #4307 
16be392 Update translation_process.md (sandakersmann)
 2014-06-08 18:17:33 +02:00
Wladimir J. van der Laan 96f6f718e4 Merge pull request #4304 
02bec4b Fix compiler warnings (Drak)
 2014-06-07 14:46:00 +02:00
Wladimir J. van der Laan db41541bc2 qt: Periodic translation update 2014-06-06 19:29:03 +02:00
Wladimir J. van der Laan 474ce0a107 Merge pull request #4295 
6e7c4d1 gitian: upgrade OpenSSL to 1.0.1h (Wladimir J. van der Laan)
 2014-06-06 18:54:55 +02:00
Wladimir J. van der Laan 95d68c48d7 Merge pull request #3959 
171ca77 estimatefee / estimatepriority RPC methods (Gavin Andresen)
0193fb8 Allow multiple regression tests to run at once (Gavin Andresen)
c6cb21d Type-safe CFeeRate class (Gavin Andresen)
 2014-06-06 18:51:00 +02:00
Wladimir J. van der Laan 345cb52e8b Merge pull request #4297 
b917555 qt: PeerTableModel: Fix potential deadlock. #4296 (Ashley Holman)
 2014-06-06 10:13:48 +02:00