Byron Hambly
|
b72895919c
|
Merge 93cc036edf into merged_master (Elements PR #1248)
All conflicts were resolved by taking the "incoming" changes by using
`git checkout --theirs src/secp256k1` during conflict resolution.
|
2023-08-29 12:25:09 +00:00 |
|
Byron Hambly
|
048984aca4
|
build: fix windows build by including SECP256K1_STATIC in configure.ac
introduced in https://github.com/BlockstreamResearch/secp256k1-zkp/pull/259
|
2023-08-23 10:38:47 +02:00 |
|
Byron Hambly
|
b6d963eea1
|
Merge 619f8a27ad into merged_master (Bitcoin PR bitcoin/bitcoin#24304)
|
2023-07-03 11:19:58 +00:00 |
|
Byron Hambly
|
01ebf8038a
|
Merge 25290071c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24397)
|
2023-07-02 17:22:18 +00:00 |
|
Byron Hambly
|
71fe5db837
|
Merge 5a8d56680b into merged_master (Bitcoin PR bitcoin/bitcoin#24112)
|
2023-07-02 14:38:51 +00:00 |
|
Byron Hambly
|
389c84425b
|
Merge 566df80624 into merged_master (Bitcoin PR bitcoin/bitcoin#24336)
|
2023-06-30 17:26:38 +00:00 |
|
Byron Hambly
|
aedaa5e61f
|
Merge 988058defb into merged_master (Bitcoin PR bitcoin/bitcoin#24254)
|
2023-06-30 16:38:27 +00:00 |
|
Byron Hambly
|
b33b683775
|
Merge c23bf06492 into merged_master (Bitcoin PR bitcoin/bitcoin#24115)
|
2023-06-30 16:22:04 +00:00 |
|
Byron Hambly
|
207c1ce338
|
Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301)
|
2023-06-30 15:43:32 +00:00 |
|
Byron Hambly
|
b01ac942ee
|
Merge a7e80449c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24238)
|
2023-06-30 12:17:11 +00:00 |
|
Byron Hambly
|
4988afcbc2
|
Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744)
|
2023-06-30 07:38:29 +00:00 |
|
Byron Hambly
|
6d649c1782
|
Merge 63fc2f5cce into merged_master (Bitcoin PR bitcoin/bitcoin#24065)
|
2023-06-20 12:24:24 +00:00 |
|
Byron Hambly
|
3b87e4efc1
|
Merge 767ee2e3a1 into merged_master (Bitcoin PR bitcoin/bitcoin#23607)
|
2023-06-19 11:08:41 +00:00 |
|
Byron Hambly
|
899437612e
|
Merge 31db3dd874 into merged_master (Bitcoin PR bitcoin/bitcoin#24048)
|
2023-06-19 10:43:32 +00:00 |
|
Byron Hambly
|
98385c2149
|
Merge 542e405a85 into merged_master (Bitcoin PR bitcoin/bitcoin#23724)
|
2023-06-15 14:36:27 +00:00 |
|
Byron Hambly
|
5c8aae9540
|
Merge 3e5dd94c42 into merged_master (Bitcoin PR bitcoin/bitcoin#23909)
|
2023-06-15 07:13:25 +00:00 |
|
Byron Hambly
|
822deee5b9
|
Merge 4eedabaf6f into merged_master (Bitcoin PR bitcoin/bitcoin#23947)
|
2023-06-14 19:21:16 +00:00 |
|
Byron Hambly
|
32f8890e2a
|
Merge bcf2b25eec into merged_master (Bitcoin PR bitcoin/bitcoin#23945)
|
2023-06-14 17:25:40 +00:00 |
|
Byron Hambly
|
4062fe4d65
|
Merge 7e0cbc8ca4 into merged_master (Bitcoin PR bitcoin/bitcoin#20201)
|
2023-06-14 15:05:59 +00:00 |
|
Byron Hambly
|
ab249ee428
|
Merge c06cda3e48 into merged_master (Bitcoin PR bitcoin/bitcoin#23383)
Kept what we already had since it's a newer version of secp256k1-zkp
|
2023-06-13 15:44:13 +00:00 |
|
Byron Hambly
|
eb524bd882
|
Merge fee16b15fa into merged_master (Bitcoin PR bitcoin/bitcoin#23744)
|
2023-06-13 13:25:27 +00:00 |
|
Byron Hambly
|
831a4e4c34
|
Merge 42796742a4 into merged_master (Bitcoin PR bitcoin/bitcoin#23761)
|
2023-06-13 08:49:48 +00:00 |
|
Byron Hambly
|
3d1ccd39fb
|
Merge 61b82a8175 into merged_master (Bitcoin PR bitcoin/bitcoin#23593)
|
2023-06-02 12:39:51 +00:00 |
|
Byron Hambly
|
1f15f80bcd
|
Merge 681b25e3cd into merged_master (Bitcoin PR bitcoin/bitcoin#23152)
|
2023-05-31 08:21:29 +00:00 |
|
Byron Hambly
|
df90beee7d
|
Merge ee7e061563 into merged_master (Bitcoin PR bitcoin/bitcoin#23557)
|
2023-05-29 13:25:34 +00:00 |
|
James Dorfman
|
0057352195
|
Merge a2ed33b23b into merged_master (Bitcoin PR bitcoin/bitcoin#23564)
|
2023-05-26 16:53:57 +00:00 |
|
Byron Hambly
|
74f2207551
|
Merge 6bde42e29e into merged_master (Bitcoin PR bitcoin/bitcoin#23511)
|
2023-05-26 12:16:49 +00:00 |
|
Byron Hambly
|
2f15858d25
|
Merge c82284cfdc into merged_master (Bitcoin PR bitcoin/bitcoin#23345)
|
2023-05-25 07:54:10 +00:00 |
|
Byron Hambly
|
9589ff438e
|
Merge 5cc083cd46 into merged_master (Bitcoin PR bitcoin/bitcoin#23473)
|
2023-05-24 13:34:07 +00:00 |
|
Byron Hambly
|
81d5607ec8
|
Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114)
|
2023-05-24 12:58:57 +00:00 |
|
Byron Hambly
|
0cad2862de
|
Merge 77a2f5d30c into merged_master (Bitcoin PR bitcoin/bitcoin#23334)
|
2023-05-17 09:41:17 +00:00 |
|
James Dorfman
|
69716bc420
|
Merge 4229f71bf8 into merged_master (Bitcoin PR bitcoin/bitcoin#23282)
|
2023-05-14 03:05:30 +00:00 |
|
James Dorfman
|
d40dae4c16
|
Merge d807aceeab into merged_master (Bitcoin PR bitcoin/bitcoin#23314)
|
2023-05-14 01:27:58 +00:00 |
|
James Dorfman
|
e3878af0b5
|
Merge f9ad4d51e3 into merged_master (Bitcoin PR bitcoin/bitcoin#23317)
|
2023-05-14 01:06:03 +00:00 |
|
James Dorfman
|
be1fc7ead9
|
Merge a7f28af437 into merged_master (Bitcoin PR bitcoin/bitcoin#22646)
|
2023-05-14 00:43:20 +00:00 |
|
Byron Hambly
|
0fc83ca86d
|
Merge a845f1ccc6 into merged_master (Bitcoin PR bitcoin/bitcoin#23269)
|
2023-05-11 11:09:14 +00:00 |
|
Byron Hambly
|
4024f43c52
|
Merge da13c7b18a into merged_master (Bitcoin PR bitcoin/bitcoin#22392)
|
2023-05-11 10:29:04 +00:00 |
|
James Dorfman
|
812ad6eb2a
|
Merge 39872f5ed4 into merged_master (Bitcoin PR bitcoin/bitcoin#23149)
|
2023-05-11 05:27:02 +00:00 |
|
Byron Hambly
|
9965963a75
|
Merge 5b7210c874 into merged_master (Bitcoin PR bitcoin/bitcoin#22409)
|
2023-05-10 13:18:26 +00:00 |
|
Byron Hambly
|
ea23138f85
|
Merge 371f0aeeb4 into merged_master (Bitcoin PR bitcoin/bitcoin#23182)
|
2023-05-09 12:04:42 +00:00 |
|
Byron Hambly
|
cca3f919f8
|
Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487)
|
2023-05-09 11:22:04 +00:00 |
|
Byron Hambly
|
4fd50c68d0
|
Merge 7f81f5459f into merged_master (Bitcoin PR bitcoin/bitcoin#23082)
|
2023-04-28 12:25:28 +00:00 |
|
Byron Hambly
|
6313268cc0
|
Merge cdce149050 into merged_master (Bitcoin PR bitcoin/bitcoin#23045)
|
2023-04-23 09:47:06 +00:00 |
|
Byron Hambly
|
73732acc1b
|
Merge 82a85216c3 into merged_master (Bitcoin PR bitcoin/bitcoin#22845)
|
2023-04-21 12:49:56 +00:00 |
|
Byron Hambly
|
9bb7d8f8d8
|
Merge 698b4b8fac into merged_master (Bitcoin PR bitcoin/bitcoin#22930)
|
2023-04-21 12:26:22 +00:00 |
|
James Dorfman
|
89b4a97f35
|
Merge 6718fbe90a into merged_master (Bitcoin PR bitcoin/bitcoin#22397)
|
2023-04-20 23:36:32 +00:00 |
|
James Dorfman
|
3cace2f326
|
Merge 78d39f8438 into merged_master (Bitcoin PR bitcoin/bitcoin#22861)
|
2023-04-20 20:38:04 +00:00 |
|
Byron Hambly
|
b595ff1652
|
Merge 19364c0ddf into merged_master (Bitcoin PR bitcoin/bitcoin#20586)
|
2023-04-11 08:09:44 +00:00 |
|
James Dorfman
|
9fafaa6b31
|
Merge d23570098c into merged_master (Bitcoin PR bitcoin/bitcoin#21882)
|
2023-03-31 19:46:32 +00:00 |
|
James Dorfman
|
400c44abcc
|
Merge 9faa4b68db into merged_master (Bitcoin PR #22232)
|
2023-03-16 04:51:52 +00:00 |
|