GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
30279 commits 49 branches 359 tags 253 MiB
Commit graph

19615 commits

Author SHA1 Message Date
Andrew Poelstra
939d8ee135 Merge ade38b6ee8 into merged_master (Bitcoin PR #20588) 
o.O apparently the `tx_aux` argument to `createrawpegin` was literally unused
 2021-06-14 02:19:09 +00:00
Andrew Poelstra
5ecb0f619f Merge b18978066d into merged_master (Bitcoin PR #20079) 2021-06-14 01:43:09 +00:00
Andrew Poelstra
0cabbc6b4a Merge ffc4d04990 into merged_master (Bitcoin PR #20275) 
As always, `git diff HEAD^ HEAD^2 -- <filename>` is your friend when understanding conflicts..
 2021-06-14 01:22:11 +00:00
Andrew Poelstra
098565e3b7 Merge 6a48063671 into merged_master (Bitcoin PR #19858) 2021-06-14 00:48:50 +00:00
Andrew Poelstra
ee43c19115 Merge 736eb4d808 into merged_master (Bitcoin PR #19982) 2021-06-14 00:27:44 +00:00
Andrew Poelstra
631fe18e64 Merge dcff2ee1fb into merged_master (Bitcoin PR #20589) 2021-06-13 22:14:31 +00:00
Andrew Poelstra
3652985c5c Merge eb53c03b36 into merged_master (Bitcoin PR #20595) 2021-06-13 21:53:52 +00:00
Andrew Poelstra
c8d2647081 Merge 38176dc665 into merged_master (Bitcoin PR #20573) 2021-06-13 21:04:50 +00:00
Andrew Poelstra
1d72c6dee8 Merge 22f13c1e08 into merged_master (Bitcoin PR #19776) 2021-06-13 19:18:27 +00:00
Andrew Poelstra
df67e5b1dd Merge f5b2ea3e59 into merged_master (Bitcoin PR #20217) 2021-06-13 18:57:45 +00:00
Andrew Poelstra
ba0858f24d Merge 0038ce9758 into merged_master (Bitcoin PR #20603) 2021-06-13 17:54:10 +00:00
Andrew Poelstra
b211bbd5b8 Merge 7212db4d2a into merged_master (Bitcoin PR #20602) 2021-06-13 17:32:58 +00:00
Andrew Poelstra
a9503e8d53 Merge 42ed7f51fa into merged_master (Bitcoin PR #20606) 2021-06-13 17:11:52 +00:00
Andrew Poelstra
8e1945ddc2 Merge 795afe6e63 into merged_master (Bitcoin PR #19910) 2021-06-13 16:49:44 +00:00
Andrew Poelstra
1c82f1f1af Merge a3586d5920 into merged_master (Bitcoin PR #20323) 2021-06-13 16:28:30 +00:00
Andrew Poelstra
49c7d30f1d Merge 90ef622ab5 into merged_master (Bitcoin PR #20564) 2021-06-11 19:27:33 +00:00
Andrew Poelstra
a3b6f760ed Merge e98d1d6740 into merged_master (Bitcoin PR #19425) 2021-06-11 19:06:47 +00:00
Andrew Poelstra
6746a47b62 Merge 1a9fa4c5ba into merged_master (Bitcoin PR #20561) 2021-06-11 18:01:55 +00:00
Andrew Poelstra
7895eae09d Merge 5c4911e7e7 into merged_master (Bitcoin PR #20568) 2021-06-11 17:20:15 +00:00
Andrew Poelstra
7a7791e879 Merge 03b1db6114 into merged_master (Bitcoin PR #18766) 2021-06-11 16:59:19 +00:00
Andrew Poelstra
84e93452f5 Merge 00f4dcd552 into merged_master (Bitcoin PR #20138) 2021-06-11 16:33:51 +00:00
Andrew Poelstra
d228e06487 Merge f3e17686b3 into merged_master (Bitcoin PR #20468) 2021-06-11 16:13:19 +00:00
Andrew Poelstra
ec8dc88631 Merge eab63b971d into merged_master (Bitcoin PR #19847) 2021-06-11 15:26:10 +00:00
Andrew Poelstra
fd819cc9f0 Merge 1a04f45fe9 into merged_master (Bitcoin PR #19832) 2021-06-11 15:05:23 +00:00
Andrew Poelstra
34db56ae3a Merge 9385549a31 into merged_master (Bitcoin PR #20581) 2021-06-11 13:09:57 +00:00
Andrew Poelstra
6d1ef33bf4 Merge c1604483d3 into merged_master (Bitcoin PR #20566) 2021-06-11 03:34:33 +00:00
Andrew Poelstra
90e6e0a67b Merge dca80ffb45 into merged_master (Bitcoin PR #20255) 2021-06-11 02:52:30 +00:00
Andrew Poelstra
77b76404ac Merge a0489f3472 into merged_master (Bitcoin PR #20221) 2021-06-11 01:14:28 +00:00
Andrew Poelstra
406e81efb5 Merge 0a13d15c14 into merged_master (Bitcoin PR #20530) 2021-06-10 23:32:14 +00:00
Andrew Poelstra
4f912b85f4 Merge c33662a0ea into merged_master (Bitcoin PR #18948) 2021-06-10 22:49:15 +00:00
Andrew Poelstra
f64501ffca Merge 7f0f01f0ab into merged_master (Bitcoin PR #20507) 2021-06-10 22:27:38 +00:00
Andrew Poelstra
0533e80b8c Merge 283f22cabb into merged_master (Bitcoin PR #20461) 2021-06-10 22:04:42 +00:00
Andrew Poelstra
2ec2763700 Merge 80d4231e16 into merged_master (Bitcoin PR #19980) 2021-06-10 21:23:06 +00:00
Andrew Poelstra
2d31b7300e Merge f17e8ba3a1 into merged_master (Bitcoin PR #20207) 2021-06-10 20:35:12 +00:00
Andrew Poelstra
dc1787367e Merge dfd0b70088 into merged_master (Bitcoin PR #20425) 2021-06-10 20:14:39 +00:00
Andrew Poelstra
b7dad02e88 Merge dcb7518067 into merged_master (Bitcoin PR #20496) 2021-06-10 19:31:16 +00:00
Andrew Poelstra
7fa3063497 Merge f2a673f15b into merged_master (Bitcoin PR bitcoin-core/gui#137) 2021-06-10 18:50:51 +00:00
Andrew Poelstra
f8af0d7192 Merge cd720337fe into merged_master (Bitcoin PR #20222) 2021-06-10 18:30:29 +00:00
Andrew Poelstra
1521881ad8 Merge 24e4857b29 into merged_master (Bitcoin PR #20494) 2021-06-10 18:09:55 +00:00
Andrew Poelstra
96df4cbd72 Merge ffd5e7a856 into merged_master (Bitcoin PR #20519) 2021-05-08 01:23:53 +00:00
Andrew Poelstra
9742f4a3b3 Merge 81d5af42f4 into merged_master (Bitcoin PR #20499) 2021-05-08 01:03:42 +00:00
Andrew Poelstra
7203c700e4 Merge 817aeca57a into merged_master (Bitcoin PR #20491) 2021-05-08 00:43:50 +00:00
Andrew Poelstra
74c14def62 Merge 854b36cfa2 into merged_master (Bitcoin PR bitcoin-core/gui#138) 2021-05-07 23:47:20 +00:00
Andrew Poelstra
2522ba9f6d Merge 1ae5758981 into merged_master (Bitcoin PR #20448) 2021-05-07 23:27:40 +00:00
Andrew Poelstra
407098393c Merge e2ff5e7b35 into merged_master (Bitcoin PR #20497) 2021-05-07 23:08:57 +00:00
Andrew Poelstra
e61e2353ae Merge 50091592dd into merged_master (Bitcoin PR #19337) 2021-05-07 22:50:26 +00:00
Andrew Poelstra
0673bc107b Merge 5c0aebfcd4 into merged_master (Bitcoin PR #19387) 2021-05-07 22:11:23 +00:00
Andrew Poelstra
8d52d54329 Merge afdfd3c8c1 into merged_master (Bitcoin PR #20403) 2021-05-07 21:52:40 +00:00
Andrew Poelstra
71c770f41d Merge 1e9e4b68f3 into merged_master (Bitcoin PR #20469) 2021-05-07 21:33:24 +00:00
Andrew Poelstra
d3321390c2 Merge ca4a784942 into merged_master (Bitcoin PR #20410) 2021-05-07 20:56:02 +00:00