GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21232 commits 49 branches 359 tags 252 MiB
Commit graph

1482 commits

Author SHA1 Message Date
Andrew Poelstra
89c96d832d Merge fe47ae168b into merged_master (Bitcoin PR #16080) 2020-10-29 21:48:45 +00:00
Andrew Poelstra
6afd6a2a04 Merge 277abed604 into merged_master (Bitcoin PR #15922) 2020-10-29 19:21:34 +00:00
Andrew Poelstra
b929383aac Merge fd7d97decb into merged_master (Bitcoin PR #15820) 2020-10-29 18:55:12 +00:00
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
d8883c3b97 Merge 1c719f78d3 into merged_master (Bitcoin PR #15006) 2020-10-29 18:09:57 +00:00
Andrew Poelstra
5cb1c16c7d Merge d5931f3676 into merged_master (Bitcoin PR #15870) 2020-10-29 18:02:26 +00:00
Andrew Poelstra
2abb7abbd9 Merge e79bbb73e0 into merged_master (Bitcoin PR #15607) 2020-10-29 16:42:01 +00:00
Andrew Poelstra
332ae826ae Merge e2371f842f into merged_master (Bitcoin PR #14802) 2020-10-29 16:38:07 +00:00
Andrew Poelstra
0360ec8cc1 Merge 79046d5749 into merged_master (Bitcoin PR #15939) 2020-10-29 15:24:41 +00:00
Andrew Poelstra
9ca74a409b Merge c5ffe8d515 into merged_master (Bitcoin PR #15730) 2020-10-29 02:14:31 +00:00
Andrew Poelstra
3a5a7341ba Merge a3d2d6b067 into merged_master (Bitcoin PR #15930) 2020-10-29 02:14:22 +00:00
Andrew Poelstra
6bf38bd282 Merge bfaa7270c4 into merged_master (Bitcoin PR #15947) 
Original commit was 773e16f919, I had to add some extra commits to restore
the accidentally(?) deleted manpage that this PR enables.
 2020-10-29 02:12:33 +00:00
Andrew Poelstra
0bd7450281 Merge 24dfcf3a56 into merged_master (Bitcoin PR #15941) 2020-10-29 02:07:32 +00:00
Andrew Poelstra
cf22dd0930 Merge 12aa2ac988 into merged_master (Bitcoin PR #15323) 2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98 Merge 2c35fe6238 into merged_master (Bitcoin PR #15849) 2020-10-29 02:06:12 +00:00
Andrew Poelstra
e34277354c Merge 8da1aa471e into merged_master (Bitcoin PR #15908) 2020-10-29 02:05:02 +00:00
Andrew Poelstra
b93cc1efd2 Merge 65ec4d6fb2 into merged_master (Bitcoin PR #15887) 2020-10-28 22:35:44 +00:00
Andrew Poelstra
f648151dc4 Merge d1c2ed8dd7 into merged_master (Bitcoin PR #15821) 2020-10-28 20:51:27 +00:00
Andrew Poelstra
37147c876b Merge 2209b3ba25 into merged_master (Bitcoin PR #15799) 2020-10-28 16:39:45 +00:00
Andrew Poelstra
dc9c535435 Merge 2a191b4846 into merged_master (Bitcoin PR #15802) 2020-10-28 16:16:28 +00:00
Andrew Poelstra
c2ec91b31b Merge 9422e2c29f into merged_master (Bitcoin PR #15792) 2020-10-28 16:05:21 +00:00
Andrew Poelstra
228f1a27ee Merge 5392aee64f into merged_master (Bitcoin PR #15629) 2020-10-28 03:11:10 +00:00
Andrew Poelstra
0374822983 Merge 8088ff21e4 into merged_master (Bitcoin PR #15765) 2020-10-28 01:07:59 +00:00
Andrew Poelstra
c85c0c1473 Merge 79f73436a9 into merged_master (Bitcoin PR #15757) 2020-10-28 00:55:50 +00:00
Andrew Poelstra
2a125939bb Merge a238fccce8 into merged_master (Bitcoin PR #15763) 2020-10-28 00:55:43 +00:00
Andrew Poelstra
dd652858a0 Merge daef20fb50 into merged_master (Bitcoin PR #15596) 2020-10-28 00:53:40 +00:00
Andrew Poelstra
8e677306d0 Merge 32e0428e37 into merged_master (Bitcoin PR #15684) 2020-10-28 00:47:51 +00:00
Andrew Poelstra
0fe213a5d9 Merge 656a15e539 into merged_master (Bitcoin PR #15620) 2020-10-28 00:35:45 +00:00
Andrew Poelstra
56d472ec04 Merge e14cd04abb into merged_master (Bitcoin PR #15637) 2020-10-28 00:11:51 +00:00
Andrew Poelstra
bd76bc4151 Merge 8a8b03ecd2 into merged_master (Bitcoin PR #15603) 2020-10-28 00:11:44 +00:00
Andrew Poelstra
da079d831f Merge 7b13c64645 into merged_master (Bitcoin PR #15642) 2020-10-28 00:11:29 +00:00
Andrew Poelstra
e842fb8db8 Merge 165ea14efe into merged_master (Bitcoin PR #15604) 2020-10-27 23:50:01 +00:00
Andrew Poelstra
a3f5c90edf Merge b83c6f7940 into merged_master (Bitcoin PR #15444) 2020-10-27 23:48:03 +00:00
Andrew Poelstra
5ae23eb085 Merge 887f57eb72 into merged_master (Bitcoin PR #15566) 2020-10-27 23:22:22 +00:00
Andrew Poelstra
1d4e3120e0 Merge 257f750cd9 into merged_master (Bitcoin PR #15565) 2020-10-27 23:21:33 +00:00
Andrew Poelstra
3e54f0e4ee Merge 6b2ee268be into merged_master (Bitcoin PR #15562) 2020-10-27 23:21:24 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Andrew Poelstra
bfee82348a Merge 4b57b7f0f0 into merged_master (Bitcoin PR #15527) 2020-10-27 21:55:20 +00:00
Andrew Poelstra
92cd9cfbc7 Merge 57acfcb9fd into merged_master (Bitcoin PR #15518) 2020-10-27 21:53:18 +00:00
Andrew Poelstra
b612189f3c Merge 9e3122de05 into merged_master (Bitcoin PR #15492) 2020-10-27 20:46:09 +00:00
Andrew Poelstra
13a63305d2 Merge e47d8a1b7c into merged_master (Bitcoin PR #15514) 2020-10-27 20:24:53 +00:00
Andrew Poelstra
77d4285f38 Merge 20268c6d76 into merged_master (Bitcoin PR #15489) 2020-10-27 19:40:35 +00:00
Andrew Poelstra
bfaa7270c4 rename bitcoin-wallet manpage to elements-wallet 2020-10-26 20:49:22 +00:00
Andrew Poelstra
62a26bebac Introduce bitcoin-wallet.1 from bitcoin upstream f5bd46a4cc 2020-10-26 20:46:24 +00:00
MarcoFalke
770d0f60b8
travis: Properly cache and error on timeout 2019-05-31 14:54:25 +01:00
Jon Atack
8afca323e3
doc: add bitcoin_config.h PACKAGE updates to release process 
and reorganise the section and add relative url links.

Follow-up to e47dc4f.
 2019-05-23 18:26:34 +02:00
Steven Roose
a39bad4a92
MERGE-FIX: manpage fixes 2019-05-21 12:17:13 +01:00
MarcoFalke
277abed604
Merge #15922: doc: Explain how to pass in non-fundamental types into functions 
faede747b3 doc: Explain how to pass in non-fundamental types into functions (MarcoFalke)

Pull request description:

  There is a common misconception in C++ that one ampersand is better than no ampersand and two ampersands are better than one.

ACKs for commit faede7:
  practicalswift:
    ACK faede747b3
  jonasschnelli:
    ACK faede747b3

Tree-SHA512: be12c23287398e4525f16e13de30e51a42d9e38284644eed5b67fa23197b09436d75a3aa8db08555ee91a38a0f159d2722b8a9927ce0bc906e600d2a7976086b
 2019-05-17 11:27:22 -04:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
MarcoFalke
fd7d97decb
Merge #15820: docs: Add productivity notes for dummy rebases 
01971da9bd docs: Add productivity notes for "dummy rebases" (Carl Dong)

Pull request description:

  When rebasing, we often want to do a "dummy rebase" whereby we are not rebasing over an updated master. This is because rebases can be confusing enough already, and we don't want to resolve upstream conflicts together with our local rebase conflicts due to fixup commits, commit rearrangements, and such. This productivity section details how to do such "dummy rebase"s.

ACKs for commit 01971d:

Tree-SHA512: 241a451cec01dc9a01a2286bdee1441cac6d28007f5b173345744d2abf436da916c3f2553ff0d1c5b3687055107b37872dda9529288645e4bae7b3cb46923b7e
 2019-05-16 13:45:12 -04:00