Merge bbb7119ca8 into merged_master (Bitcoin PR #15978)

This commit is contained in:
Andrew Poelstra 2020-10-29 04:20:01 +00:00
commit 83a88112d6

5
.gitignore vendored
View file

@ -62,7 +62,6 @@ src/qt/bitcoin-qt.includes
*.pyc
*.o
*.o-*
*.patch
*.a
*.pb.cc
*.pb.h
@ -75,6 +74,10 @@ src/qt/bitcoin-qt.includes
*.json.h
*.raw.h
# Only ignore unexpected patches
*.patch
!depends/patches/*.patch
#libtool object files
*.lo
*.la