James Dorfman
03b65b9021
Merge 7878c8655c into merged_master (Bitcoin PR bitcoin/bitcoin#24674 )
2024-03-19 22:21:56 +00:00
James Dorfman
52a17a3490
Merge 6b1f93700c into merged_master (Bitcoin PR bitcoin/bitcoin#24666 )
2024-03-19 22:09:33 +00:00
James Dorfman
ff2e02aa4f
Merge f10b24ad29 into merged_master (Bitcoin PR bitcoin/bitcoin#24672 )
2024-03-19 20:21:01 +00:00
James Dorfman
363d930f8e
Merge 9344697e57 into merged_master (Bitcoin PR bitcoin/bitcoin#21160 )
2024-03-19 20:07:00 +00:00
James Dorfman
087b2f13f4
Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536 )
2024-03-19 19:58:32 +00:00
James Dorfman
1b570a616b
Merge d2615312c1 into merged_master (Bitcoin PR bitcoin/bitcoin#19385 )
2024-03-19 07:11:44 +00:00
James Dorfman
e2f9ba794f
Merge 56c8658700 into merged_master (Bitcoin PR bitcoin/bitcoin#24663 )
2024-03-19 06:39:38 +00:00
James Dorfman
17d45cdb7d
Merge 3740cdd125 into merged_master (Bitcoin PR bitcoin/bitcoin#24091 )
2024-03-19 06:35:30 +00:00
Byron Hambly
b9f9528b7c
Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205 )
2024-02-02 14:57:29 +02:00
Byron Hambly
9f081a556e
Merge 0a14a16efe into merged_master (Bitcoin PR bitcoin/bitcoin#24625 )
2024-02-02 12:01:42 +02:00
Byron Hambly
7629e72362
Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626 )
2024-02-02 11:54:04 +02:00
Byron Hambly
9af9536b24
Merge 213e98ca82 into merged_master (Bitcoin PR bitcoin/bitcoin#24169 )
2024-02-02 11:12:43 +02:00
James Dorfman
5e7204072c
Merge e7b6272b30 into merged_master (Bitcoin PR bitcoin/bitcoin#24636 )
2024-02-02 10:35:55 +02:00
James Dorfman
5082ed04fd
Merge 98e9d8e8e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23732 )
2024-01-11 18:05:49 +00:00
James Dorfman
e8e87a7639
Merge cea230eec4 into merged_master (Bitcoin PR bitcoin/bitcoin#24562 )
2024-01-11 17:57:30 +00:00
James Dorfman
3215693c0c
Merge 30041261a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24582 )
2024-01-11 16:51:34 +00:00
James Dorfman
cc32b91393
Merge 3ab96f2945 into merged_master (Bitcoin PR bitcoin/bitcoin#24560 )
2024-01-11 16:36:11 +00:00
James Dorfman
621c6503ef
Merge f9ed0aec1b into merged_master (Bitcoin PR bitcoin-core/gui#568 )
2024-01-09 00:23:33 +00:00
James Dorfman
a0093e2760
Merge d6f225f5c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24462 )
2024-01-09 00:06:54 +00:00
James Dorfman
fc82acc77c
Merge f05cf59d91 into merged_master (Bitcoin PR bitcoin/bitcoin#24624 )
2024-01-08 21:35:36 +00:00
James Dorfman
cb7f5f56f3
Merge 2948d6dea0 into merged_master (Bitcoin PR bitcoin/bitcoin#15423 )
2024-01-08 21:22:59 +00:00
James Dorfman
ca4e1d45b3
Merge 44dbf918d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24627 )
2024-01-08 21:14:52 +00:00
James Dorfman
82b188df34
Merge 138d55e6a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24579 )
...
In blockchain.cpp: set optional=true for 'softforks' argument in getblockchaininfo
docs.
Also removed two levels of indentation from that function (to match the associated
formatting fix in upstream).
2024-01-08 21:05:37 +00:00
Byron Hambly
93ade4baa3
Merge e66630cc87 into merged_master (Bitcoin PR bitcoin/bitcoin#13226 )
2023-10-16 13:12:42 +00:00
Byron Hambly
6768c48aee
Merge 6c72f3192a into merged_master (Bitcoin PR bitcoin/bitcoin#23880 )
2023-10-16 12:54:38 +00:00
Byron Hambly
e6077411e8
Merge ae005a647f into merged_master (Bitcoin PR bitcoin-core/gui#554 )
2023-10-16 12:31:55 +00:00
Byron Hambly
51288f4f73
Merge a7b3123fea into merged_master (Bitcoin PR bitcoin/bitcoin#24609 )
2023-10-16 11:46:33 +00:00
Byron Hambly
fbd708bbca
Merge bf2c0fb2a2 into merged_master (Bitcoin PR bitcoin/bitcoin#24472 )
2023-10-16 11:10:36 +00:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
Byron Hambly
ec293ef76f
Merge aece566249 into merged_master (Bitcoin PR bitcoin-core/gui#555 )
...
This merge had a conflict in the send coins dialog, so it should be
confirmed during review that it still works correctly.
2023-10-16 10:54:11 +00:00
Byron Hambly
8a8b029f97
Merge b8992f2d4a into merged_master (Bitcoin PR bitcoin/bitcoin#24592 )
2023-10-16 08:57:05 +00:00
Byron Hambly
e592d94373
Merge 3617d22562 into merged_master (Bitcoin PR bitcoin/bitcoin#14752 )
2023-10-16 08:38:28 +00:00
Byron Hambly
f32c2f4e73
Merge e4d61d9759 into merged_master (Bitcoin PR bitcoin/bitcoin#18815 )
2023-10-16 08:21:11 +00:00
James Dorfman
e382a490a7
Merge 310ba92494 into merged_master (Bitcoin PR bitcoin/bitcoin#24537 )
2023-10-16 04:28:12 +00:00
James Dorfman
3f110a3fe4
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080 )
2023-10-15 22:22:18 +00:00
James Dorfman
f3ee905625
Merge e0881aa5f0 into merged_master (Bitcoin PR bitcoin/bitcoin#24505 )
2023-10-15 21:39:09 +00:00
Byron Hambly
b7467fc044
Merge e04720ec33 into merged_master (Bitcoin PR bitcoin/bitcoin#24528 )
2023-10-15 13:33:48 +00:00
Byron Hambly
75b07c4252
Merge 2860a91df0 into merged_master (Bitcoin PR bitcoin/bitcoin#24527 )
2023-10-15 11:57:43 +00:00
Byron Hambly
35e8c6d908
Merge e7db4e245a into merged_master (Bitcoin PR bitcoin/bitcoin#24164 )
2023-10-14 19:42:34 +00:00
Byron Hambly
40e776c576
Merge c109e7d51c into merged_master (Bitcoin PR bitcoin/bitcoin#24530 )
2023-10-14 17:11:39 +00:00
Byron Hambly
a1e559fe38
Merge a81717443f into merged_master (Bitcoin PR bitcoin/bitcoin#24453 )
2023-10-14 16:43:10 +00:00
Byron Hambly
4c573ba511
Merge 23e8c702bc into merged_master (Bitcoin PR bitcoin/bitcoin#24421 )
2023-10-14 16:21:34 +00:00
Byron Hambly
bdfb01f6e1
Merge 93feabcb30 into merged_master (Bitcoin PR bitcoin-core/gui#563 )
2023-10-14 12:40:23 +00:00
Byron Hambly
755a0686e5
Merge 6c37eae0ad into merged_master (Bitcoin PR bitcoin/bitcoin#24404 )
2023-10-14 12:09:09 +00:00
Byron Hambly
2375fc7d0e
Merge 4f5d3ce5a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24486 )
2023-10-14 12:00:47 +00:00
Byron Hambly
ca3f6da75f
Merge 76d44e832f into merged_master (Bitcoin PR bitcoin/bitcoin#24469 )
2023-10-14 11:52:24 +00:00
Byron Hambly
c3e42873de
Merge 5e33620ad8 into merged_master (Bitcoin PR bitcoin/bitcoin#24371 )
2023-10-14 11:06:17 +00:00
Byron Hambly
ccdc1ab80b
Merge 47bbd3ff4f into merged_master (Bitcoin PR bitcoin/bitcoin#24498 )
2023-10-14 10:46:50 +00:00
Byron Hambly
c070669f64
Merge 7003b6ab24 into merged_master (Bitcoin PR bitcoin/bitcoin#24138 )
2023-10-14 09:54:25 +00:00
Byron Hambly
b91351e9fb
Merge 05e5af5a6c into merged_master (Bitcoin PR bitcoin/bitcoin#24507 )
2023-10-13 13:38:58 +00:00
