Merge tag 'v2.1.0'

Release v2.1.0. Conflicts: README.md src/chainparams.cpp src/deprecation.h src/metrics.cpp
Tomas-M · Nov 6, 2019 · e77d737 · e77d737
2 parents 590acaa + ffdba7c
commit e77d737
Show file tree

Hide file tree

Showing 266 changed files with 3,099 additions and 46,137 deletions.
diff --git a/COPYING b/COPYING
@@ -46,8 +46,4 @@ following files in build-aux/m4 (see https://github.com/zcash/zcash/issues/2827)
  * ax_check_compile_flag.m4
  * ax_check_link_flag.m4
  * ax_check_preproc_flag.m4
- * ax_compiler_vendor.m4
- * ax_gcc_archflag.m4
- * ax_gcc_x86_cpuid.m4
- * ax_openmp.m4
  * ax_pthread.m4
diff --git a/INSTALL b/INSTALL
@@ -1,5 +1,5 @@
 Building Zcash
 
-See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd,
+See the Zcash documentation wiki (https://zcash.readthedocs.io/en/latest/rtd_pages/user_guide.html) for instructions on building zcashd,
 the intended-for-services, no-graphical-interface, reference
 implementation of Zcash.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-VoteCoin 2.0.7
+VoteCoin 2.1.0
 ==============
 
 What is VoteCoin?

diff --git a/build-aux/m4/ax_compiler_vendor.m4 b/build-aux/m4/ax_compiler_vendor.m4