Mike Slominsk
43657b5aaa
Adds an -fno-stack-check compile time flag to OSX local builds
2021-05-18 15:15:38 -07:00
Andrew Poelstra
a1bac6d8a6
build: drop the rendered icon stuff
...
This is broken in multiple ways, does not exist in 0.14, appears in an
unreviewed mega-PR "porting" from a version of liquid-qt that I cannot
track down, and apparently has caused a fair bit of follow-on trouble
with icon integration.
Just put the icons in the repo like upstream does.
The committed icons were built using the Makefile prior to this
commit, starting from ./share/pixmaps/nsis-wizard.svg and
./src/qt/res/src/bitcoin.svg. They should be recreated manually
if they need to be changed in the future.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
0118851154
Merge b9ee263ef6 into merged_master (Elements PR #966 )
...
of course a one-line PR manages to conflict..
2021-03-26 00:30:30 +00:00
Philippe McLean
77349c16a5
Update the copyright year to 2021
2021-03-04 07:57:00 -08:00
Andrew Poelstra
f3afbf3d85
Merge f3727fd735 into merged_master (Bitcoin PR #20156 )
2020-12-01 18:41:26 +00:00
Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
a8f78d1aef
Merge 99a1d572ea into merged_master (Bitcoin PR #18750 )
2020-11-30 18:59:04 +00:00
Andrew Poelstra
45f9d081a2
Merge b337bd7bc0 into merged_master (Bitcoin PR #20065 )
2020-11-30 16:22:16 +00:00
Andrew Poelstra
510dbdf232
Merge 48a9968e50 into merged_master (Bitcoin PR #19558 )
2020-11-29 04:52:57 +00:00
Andrew Poelstra
a3ff560ad9
Merge 0adb80fe63 into merged_master (Bitcoin PR #19803 )
2020-11-28 17:09:11 +00:00
Andrew Poelstra
aca1bc6758
Merge 4631dc5c57 into merged_master (Bitcoin PR #18921 )
2020-11-28 16:41:46 +00:00
Andrew Poelstra
69eb9b4129
Merge 8e0f341779 into merged_master (Bitcoin PR #15704 )
2020-11-28 04:49:15 +00:00
Andrew Poelstra
53e67bb561
Merge 38c13a4a60 into merged_master (Bitcoin PR #19689 )
2020-11-28 03:55:30 +00:00
Andrew Poelstra
a8f6b64ade
Merge 772cb03a28 into merged_master (Bitcoin PR #19015 )
2020-11-28 00:10:41 +00:00
Andrew Poelstra
634f063a22
Merge 53dac67a97 into merged_master (Bitcoin PR #19719 )
2020-11-27 23:47:45 +00:00
Andrew Poelstra
c5777e4cb6
Merge 038a04eb80 into merged_master (Bitcoin PR #19688 )
2020-11-27 16:46:55 +00:00
Andrew Poelstra
d124975ffd
Merge 82127d27c9 into merged_master (Bitcoin PR #19667 )
2020-11-27 02:41:18 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
853b831d64
Merge 400f45ec9b into merged_master (Bitcoin PR #19525 )
2020-11-26 20:56:20 +00:00
Andrew Poelstra
a1a5fbf2d4
Merge 007e15dcd7 into merged_master (Bitcoin PR #19565 )
2020-11-26 18:17:42 +00:00
Andrew Poelstra
5656bc3956
Merge 2c4093ebc3 into merged_master (Bitcoin PR #18882 )
2020-11-26 04:46:09 +00:00
Andrew Poelstra
5256a1801a
Merge 7d9008f43e into merged_master (Bitcoin PR #18307 )
2020-11-26 01:09:18 +00:00
Andrew Poelstra
c98ad474ff
Merge 9d92ee12fd into merged_master (Bitcoin PR #19257 )
2020-11-26 01:09:17 +00:00
Andrew Poelstra
e2677ef2dc
Merge 1269cab21a into merged_master (Bitcoin PR #19403 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
b045c71f40
Merge dd191b5832 into merged_master (Bitcoin PR #19356 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
d9dfab5f35
Merge 931035b608 into merged_master (Bitcoin PR #19301 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
66472b679f
Merge f658c15bb9 into merged_master (Bitcoin PR #18434 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
e2ceebdba5
Merge 265492723a into merged_master (Bitcoin PR #18297 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
b9a74b0aeb
Merge 8c97780db8 into merged_master (Bitcoin PR #19228 )
...
This commit updates libsecp; I didn't take the update (since I had already updated
to a more recent version of secp-zkp several commits ago) but did take Pieter's
cleanups in the rest of the codebase.
2020-11-26 01:09:04 +00:00
Andrew Poelstra
6bb4431a8f
Merge 807b9f8114 into merged_master (Bitcoin PR #19188 )
2020-11-26 01:09:00 +00:00
Andrew Poelstra
f97404e437
Merge aa35ea5502 into merged_master (Bitcoin PR #19173 )
2020-11-26 01:08:59 +00:00
Andrew Poelstra
b8d665f61a
Merge b46fb5cb10 into merged_master (Bitcoin PR #19131 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
7e76f47be1
Merge b42bc33d2d into merged_master (Bitcoin PR #19152 )
2020-11-26 01:08:57 +00:00
Andrew Poelstra
207e69c339
Merge a8327fd71f into merged_master (Bitcoin PR #19072 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
20a39c64b7
Merge fc1fb4dd7c into merged_master (Bitcoin PR #19094 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
b196763cb6
Merge 082a417abc into merged_master (Bitcoin PR #18635 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
8748cadcca
Merge 97b21b302a into merged_master (Bitcoin PR #18677 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
a1b0bf01e3
Merge 0aa2ff0f66 into merged_master (Bitcoin PR #18956 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
ba9005aa9b
Merge 04c09553d8 into merged_master (Bitcoin PR #18887 )
2020-11-26 01:08:43 +00:00
Andrew Poelstra
a9e2796675
Merge 5d18c0ae18 into merged_master (Bitcoin PR #18862 )
2020-11-26 01:08:43 +00:00
Andrew Poelstra
acae1846f6
Merge 6c647c89db into merged_master (Bitcoin PR #18738 )
2020-11-26 01:08:43 +00:00
Andrew Poelstra
530a413055
Merge 219c55da75 into merged_master (Bitcoin PR #16710 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
57d9b2f216
Merge 49d237ce32 into merged_master (Bitcoin PR #18928 )
2020-11-26 01:08:41 +00:00
Andrew Poelstra
f32fd217a5
Merge ec4d27fa8b into merged_master (Bitcoin PR #18216 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
31a9eea2af
Merge 3b1e289248 into merged_master (Bitcoin PR #18535 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
75074c1d3c
Merge c6b15ec0ee into merged_master (Bitcoin PR #17874 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
bdd412086c
Merge 6621be5351 into merged_master (Bitcoin PR #18843 )
2020-11-26 01:08:38 +00:00
Andrew Poelstra
028afdac4a
Merge e727c2bdca into merged_master (Bitcoin PR #18088 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
2cee434502
Merge 35ef3c15ef into merged_master (Bitcoin PR #18591 )
2020-11-26 01:08:34 +00:00
