Merge 8ee572f into merged_master (Bitcoin PR #16371)

8paa · Nov 9, 2020 · d0b7e52 · d0b7e52
2 parents 6daf606 + 8ee572f
commit d0b7e52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -133,3 +133,7 @@ db4/
 
 # clang-check
 *.plist
+
+osx_volname
+dist/
+*.background.tiff
diff --git a/Makefile.am b/Makefile.am
@@ -311,4 +311,5 @@ clean-docs:
 clean-local: clean-docs
 	rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
 	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__
+	rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff