Merge commit '8ab24e8d' into tmp

This commit is contained in:
Andrew Poelstra
2020-11-04 21:46:54 +00:00
20 changed files with 2442 additions and 27 deletions

View File

@@ -174,3 +174,11 @@ endif
if ENABLE_MODULE_SURJECTIONPROOF
include src/modules/surjection/Makefile.am.include
endif
if ENABLE_MODULE_EXTRAKEYS
include src/modules/extrakeys/Makefile.am.include
endif
if ENABLE_MODULE_SCHNORRSIG
include src/modules/schnorrsig/Makefile.am.include
endif