Merge pull request #96 from VitaeTeam/rel-4.6.0

Merge v4.6.0 changes into master
VitaeTeam · Mar 1, 2021 · 749c622 · 749c622
2 parents 250ed54 + 2be499c
commit 749c622
Show file tree

Hide file tree

Showing 69 changed files with 5,485 additions and 900 deletions.
diff --git a/COPYING b/COPYING
@@ -1,6 +1,9 @@
 Copyright (c) 2009-2015 Bitcoin Developers
 Copyright (c) 2014-2015 Dash Developers
-Copyright (c) 2015-2017 The PIVX developers
+Copyright (c) 2011-2013 The PPCoin developers
+Copyright (c) 2013-2014 The NovaCoin Developers
+Copyright (c) 2014-2018 The BlackCoin Developers
+Copyright (c) 2015-2019 PIVX Developers
 Copyright (c) 2018-2018 VITAE Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
-define(_CLIENT_VERSION_MINOR, 5)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 6)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)