Andrew Poelstra
d9be33fd7c
Merge 9217f9fe73 into merged_master (Bitcoin PR #21522 )
2021-06-28 14:24:19 +00:00
Andrew Poelstra
d5101eebcb
Merge 23b15601df into merged_master (Bitcoin PR #17227 )
2021-06-28 13:45:32 +00:00
Andrew Poelstra
2fe92c0077
Merge b1281b5d8f into merged_master (Bitcoin PR #21516 )
2021-06-28 13:25:43 +00:00
Andrew Poelstra
94f6caa95e
Merge f95071a3f5 into merged_master (Bitcoin PR #21489 )
2021-06-28 04:42:35 +00:00
Andrew Poelstra
5669fcae4e
Merge 681c21be9a into merged_master (Bitcoin PR #21512 )
2021-06-28 03:20:43 +00:00
Andrew Poelstra
b4c1a6296c
Merge 837e59eff6 into merged_master (Bitcoin PR bitcoin-core/gui#248 )
2021-06-28 02:51:02 +00:00
Andrew Poelstra
b02e7d9edb
Merge 55ceaeb8c4 into merged_master (Bitcoin PR #18030 )
2021-06-28 02:26:25 +00:00
Andrew Poelstra
37a7acff4b
Merge fd2b22bf24 into merged_master (Bitcoin PR #21142 )
2021-06-28 02:13:31 +00:00
Andrew Poelstra
165812fb96
Merge d400e672a0 into merged_master (Bitcoin PR #21487 )
2021-06-28 00:13:43 +00:00
Andrew Poelstra
63f9d2d6c2
Merge 1e4a3c057a into merged_master (Bitcoin PR #21317 )
2021-06-27 22:06:41 +00:00
Andrew Poelstra
3a62250bbc
Merge 786654aa5e into merged_master (Bitcoin PR #21498 )
2021-06-27 21:54:10 +00:00
Andrew Poelstra
061147f40f
Merge 80cb51cc6b into merged_master (Bitcoin PR #21491 )
2021-06-27 21:41:51 +00:00
Andrew Poelstra
d4e8b6a6da
Merge d2a78ee928 into merged_master (Bitcoin PR #21488 )
2021-06-27 21:29:27 +00:00
Andrew Poelstra
2b2fb493a3
Merge 9dbec05600 into merged_master (Bitcoin PR #21349 )
2021-06-27 21:17:08 +00:00
Andrew Poelstra
1c58e32ee6
Merge 4132193617 into merged_master (Bitcoin PR #21040 )
2021-06-27 21:04:51 +00:00
Andrew Poelstra
651b96887d
Merge 63952f73b3 into merged_master (Bitcoin PR #20921 )
2021-06-27 20:52:33 +00:00
Andrew Poelstra
a4e0826481
Merge 3530d5d2d8 into merged_master (Bitcoin PR #18335 )
2021-06-27 20:40:06 +00:00
Andrew Poelstra
4447f4d24a
Merge 18cd0888ef into merged_master (Bitcoin PR #21328 )
2021-06-27 20:27:35 +00:00
Andrew Poelstra
8a85de8021
Merge 3a12fdba51 into merged_master (Bitcoin PR #21235 )
2021-06-27 20:02:44 +00:00
Andrew Poelstra
16c5deace1
Merge c970c1477d into merged_master (Bitcoin PR #21380 )
2021-06-27 19:50:25 +00:00
Andrew Poelstra
d44ce3a73f
Merge 8ec881d3b6 into merged_master (Bitcoin PR #20861 )
2021-06-27 19:12:42 +00:00
Andrew Poelstra
b374be990c
Merge 6834e02c89 into merged_master (Bitcoin PR #21425 )
2021-06-27 15:55:20 +00:00
Andrew Poelstra
28946544b0
Merge e057e01b7b into merged_master (Bitcoin PR #21162 )
2021-06-27 15:43:04 +00:00
Andrew Poelstra
26fd4eb181
Merge a9d1b40d53 into merged_master (Bitcoin PR #21415 )
2021-06-27 15:02:35 +00:00
Andrew Poelstra
a4a400ef64
Merge 993ecafa5e into merged_master (Bitcoin PR #21417 )
2021-06-27 14:38:37 +00:00
Andrew Poelstra
b1fab9a7e6
Merge d25e28c20b into merged_master (Bitcoin PR #21083 )
2021-06-27 14:26:06 +00:00
Andrew Poelstra
07d04a45c3
Merge 01bb3afb51 into merged_master (Bitcoin PR #21447 )
2021-06-27 03:13:21 +00:00
Andrew Poelstra
157817fed9
Merge 1b6c463e03 into merged_master (Bitcoin PR #21407 )
2021-06-27 03:01:01 +00:00
Andrew Poelstra
1a8a37c380
Merge 7723479300 into merged_master (Bitcoin PR #220 )
2021-06-27 02:48:50 +00:00
Andrew Poelstra
c67e280a4f
Merge 3b408d21e0 into merged_master (Bitcoin PR #21438 )
2021-06-27 02:36:32 +00:00
Andrew Poelstra
3b7df88c5c
Merge af6ee17545 into merged_master (Bitcoin PR #21405 )
2021-06-27 02:24:17 +00:00
Andrew Poelstra
138f99bd26
Merge cb0aafbd21 into merged_master (Bitcoin PR #21444 )
2021-06-27 02:11:59 +00:00
Andrew Poelstra
72ecc0a9a4
Merge 8e6532053f into merged_master (Bitcoin PR bitcoin-core/gui#246 )
2021-06-27 01:59:26 +00:00
Andrew Poelstra
d16103e6c4
Merge b650c9140e into merged_master (Bitcoin PR #21141 )
2021-06-27 01:12:01 +00:00
Andrew Poelstra
a9e992bab1
Merge 67ec26cacf into merged_master (Bitcoin PR #19259 )
2021-06-27 00:59:35 +00:00
Andrew Poelstra
3d7e203043
Merge c771fc0dc1 into merged_master (Bitcoin PR #21424 )
2021-06-27 00:34:29 +00:00
Andrew Poelstra
4c28f2aa84
Merge 9a5e097435 into merged_master (Bitcoin PR #21443 )
2021-06-27 00:22:03 +00:00
Andrew Poelstra
300578de7a
Merge eceb3f7707 into merged_master (Bitcoin PR #19415 )
2021-06-27 00:09:36 +00:00
Andrew Poelstra
ab82449959
Merge c47979778d into merged_master (Bitcoin PR #21426 )
2021-06-26 23:57:03 +00:00
Andrew Poelstra
a64f85e647
Merge 1e57d14d96 into merged_master (Bitcoin PR #21035 )
2021-06-26 23:44:41 +00:00
Andrew Poelstra
f5f1e8d3d5
Merge 6bc51af5c2 into merged_master (Bitcoin PR bitcoin-core/gui#250 )
2021-06-26 23:32:13 +00:00
Andrew Poelstra
e2a108eb67
Merge 16209b1b19 into merged_master (Bitcoin PR #20556 )
2021-06-26 23:19:58 +00:00
Andrew Poelstra
8c54b98b25
Merge e0bc27a14c into merged_master (Bitcoin PR #21404 )
2021-06-26 22:39:09 +00:00
Andrew Poelstra
6ce4bdb7bc
Merge a13a8cd8e3 into merged_master (Bitcoin PR #21394 )
2021-06-26 21:56:44 +00:00
Andrew Poelstra
4135bed184
Merge b972913c33 into merged_master (Bitcoin PR bitcoin-core/gui#188 )
2021-06-26 21:44:10 +00:00
Andrew Poelstra
6ab18fa738
Merge 3172615d2c into merged_master (Elements PR ElementsProject/elements#986 )
...
Note: up to this point I still had the old "sort by UNIX timestamp"
behavior on, which may have meant that some PRs were merged out of
order (i.e. multiple merged at once, followed by no-op merges). I
turned this off, and now just use git's default topo-sort (and manually
switch between Elements merges and Bitcoin merges).
2021-06-26 20:57:54 +00:00
Andrew Poelstra
7602228cf0
Merge 92cf3a22e3 into merged_master (Bitcoin PR #21007 )
2021-06-26 19:51:03 +00:00
Andrew Poelstra
9e0c92057c
Merge e828fc8f52 into merged_master (Bitcoin PR #21376 )
2021-06-26 19:33:37 +00:00
Andrew Poelstra
05bd3e6667
Merge 767bb7d5c5 into merged_master (Bitcoin PR #21270 )
2021-06-26 19:21:09 +00:00
Andrew Poelstra
dcc80b82f2
Merge 63314b8211 into merged_master (Bitcoin PR bitcoin-core/gui#229 )
2021-06-26 19:01:37 +00:00
