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

26065 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Poelstra
a9956489b2 Merge c54295c1a2 into merged_master (Bitcoin PR #18641) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
51efdc2d8b Merge d7bdba460c into merged_master (Bitcoin PR #18683) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
86082b9846 Merge 244daa4821 into merged_master (Bitcoin PR #18607) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
2ef6b9b646 Merge ecc2e4e363 into merged_master (Bitcoin PR #18664) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
a1367df7d3 Merge c2e53ff064 into merged_master (Bitcoin PR #18467) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
7acaa0481b Merge c189bfd260 into merged_master (Bitcoin PR #17824) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
0471fb918b Merge 4a71c46905 into merged_master (Bitcoin PR #18670) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
4b58cd7c0a Merge 0856c15706 into merged_master (Bitcoin PR #18262) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
bc49e22548 Merge f0d97cdf70 into merged_master (Elements PR #861) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
e6c67f94cc Merge 969ee85494 into merged_master (Bitcoin PR #18662) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
d1bc380279 Merge 8f2497941e into merged_master (Bitcoin PR #18598) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
2119e3a935 Merge 447f8676b2 into merged_master (Bitcoin PR #18667) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
30adb9243b Merge d8dfcea5d9 into merged_master (Bitcoin PR #17669) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
cf039bc4dd Merge 18fadbafcc into merged_master (Elements PR #863) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
90d6e1ff84 Merge a19c972098 into merged_master (Elements PR #865) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
bf709b0d4b Merge f4c0ad4aef into merged_master (Bitcoin PR #18660) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
fd4ce54b94 Merge 661e8df1b6 into merged_master (Bitcoin PR #18653) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
2bf8400edc Merge 79b0459648 into merged_master (Bitcoin PR #18650) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
1b585cf0c3 Merge e16718a8b3 into merged_master (Bitcoin PR #18401) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
ce73c2d3ba Merge af23572fe7 into merged_master (Elements PR #860) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
2016bea80a Merge 544709763e into merged_master (Bitcoin PR #18571) 
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
 2020-11-26 01:08:20 +00:00
Andrew Poelstra
713ff5a8b6 Merge e84a5f0004 into merged_master (Bitcoin PR #18645) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
5f636536ce Merge 6db8ef2431 into merged_master (Bitcoin PR #18640) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
82a7313818 Merge 4bd6bc5cb4 into merged_master (Bitcoin PR #18615) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
c63e500dfd Merge 20c0e2e0f0 into merged_master (Bitcoin PR #18628) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
0593f0267b Merge 18f11fb24b into merged_master (Bitcoin PR #18646) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
70749cc743 Merge e831f18b1e into merged_master (Bitcoin PR #18619) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
3fc4c319be Merge 5447d57bff into merged_master (Bitcoin PR #18624) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
93b6aa5c70 Merge ae486b263c into merged_master (Bitcoin PR #17929) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
8df275dcb1 Merge 903be99ee6 into merged_master (Bitcoin PR #18621) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
e8fb7a235f Merge 4d793bcfe8 into merged_master (Bitcoin PR #18632) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
8ecedcea73 Merge 75fcfdaf8b into merged_master (Bitcoin PR #18631) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
23cab4213a Merge 4702cadca9 into merged_master (Bitcoin PR #17954) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
0dc35ccd83 Merge 6110ae8326 into merged_master (Bitcoin PR #18451) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c729046501 Merge 6ef45bc968 into merged_master (Bitcoin PR #18581) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
f8b9066bb1 Merge 130b64415f into merged_master (Bitcoin PR #18493) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
3ad3ea7e75 Merge e28e5353c4 into merged_master (Bitcoin PR #18545) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c67b9f0c92 Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
f72cf74cb7 Merge d5783985eb into merged_master (Bitcoin PR #18502) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
0f61201649 Merge 4d26312c17 into merged_master (Bitcoin PR #18597) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
bea14c785a Merge c49971f3c9 into merged_master (Bitcoin PR #18584) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
79067914d8 Merge a2b282c9d0 into merged_master (Bitcoin PR #18609) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
9146c7899d Merge 59d6249290 into merged_master (Bitcoin PR #18593) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
d6d099ce1c Merge 76143bf714 into merged_master (Bitcoin PR #18495) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
c37ebe5b63 Merge ed3b8eada8 into merged_master (Bitcoin PR #17595) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
295275e76c Merge a5623ba89f into merged_master (Bitcoin PR #18588) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
85838bef74 Merge 3eb8b1c392 into merged_master (Bitcoin PR #17905) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
bd6ce65044 Merge 75917591c8 into merged_master (Bitcoin PR #18586) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00