UdjinM6
|
6af7a58d92
|
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc12, fix/dashify
NOTE: .travis.yml was mostly preserved, probably needs additional attention
|
2016-08-26 04:09:20 +03:00 |
|
Holger Schinzel
|
f4e4dd65e7
|
Tag 0.12.1 final
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEbBAABCgAGBQJXD/i3AAoJEHSBCwEjRsmmOHsH+L5eRpiPeLhrDYyBFbp9RFKU
TztyoeKAM4llEPmk6vAawgSL8HNY4va6lbY84sDfvCdLJqCxVR7MyiuQ4AQPXG4R
Ke5DJ/G/K4ngyqruCBsSh2RJdVDrbE3zCmjN5gxPxrNKpi+mXs//A6gjvfxn4U1F
WZepN3FzNFcqFG/ndKxptMYZoIuiK9JIhK7V/ksFKRPlUhipa1jh5sIWvCeFjiLT
Wt8wGlHPHDFsPJW1o7EWMTHRhNCVqYhMDU7GT6FixIJFRGANIGlwfIUuqqUt0sil
7YWIwD/+ai3dfeODazauqJAOEBXjoWCkuXn9IN/VhtvHOFR6AZO2aljS9ks6Cw==
=6vRi
-----END PGP SIGNATURE-----
Merge bitcoin tag 'v0.12.1' into dash v0.12.1.x
Merging Bitcoin 0.12.1 into Dash 0.12.1.x
|
2016-07-04 11:20:16 +02:00 |
|
MarcoFalke
|
f1f1b82033
|
[qa] py2: Unfiddle strings into bytes explicitly
Github-Pull: #7853
Rebased-From: faa41ee204, fa7abe0a00
Conflicts:
qa/rpc-tests/invalidtxrequest.py
qa/rpc-tests/p2p-feefilter.py
qa/rpc-tests/proxy_test.py
qa/rpc-tests/test_framework/mininode.py
qa/rpc-tests/test_framework/netutil.py
src/test/bctest.py
|
2016-04-15 09:55:12 +02:00 |
|
MarcoFalke
|
f04f4fd2ee
|
[doc/log] Fix markdown syntax and line terminate LogPrint
- Fix doxygen comment for payTxFee
- [doc] Fix markdown
- Make sure LogPrintf strings are line-terminated
Github-Pull: #7617
Rebased-From: fa06ce0949 fa97f95c15 fa26652459
|
2016-03-11 09:44:17 +01:00 |
|
UdjinM6
|
31ff9c2ff8
|
Fix rpc-tests, relies on PRs #715-#719
Closes #720
|
2016-03-06 18:16:02 +01:00 |
|
Gregory Sanders
|
d52fbf00e3
|
Added additional config option for multiple RPC users.
|
2015-11-29 08:34:20 -05:00 |
|