diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@
)
project(bitcoin-abc
- VERSION 0.20.9
+ VERSION 0.20.10
DESCRIPTION "Bitcoin ABC is a full node implementation of the Bitcoin Cash protocol."
HOMEPAGE_URL "https://www.bitcoinabc.org"
)
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 20)
-define(_CLIENT_VERSION_REVISION, 9)
+define(_CLIENT_VERSION_REVISION, 10)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
define(_COPYRIGHT_HOLDERS,[The %s developers])
diff --git a/doc/release-notes.md b/doc/release-notes.md
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,8 +1,9 @@
-Bitcoin ABC version 0.20.9 is now available from:
+Bitcoin ABC version 0.20.10 is now available from:
-
+
This release includes the following features and fixes:
+<<<<<<< HEAD
- Fixed a bug with Multiwallets that have their own directories (i.e. cases
such as `DATADIR/wallets/mywallet/wallet.dat`). Backups of these wallets
will now take each wallet's specific directory into account.
@@ -16,3 +17,5 @@
- Remove deprecated "startingpriority" and "currentpriority" from
`getrawmempool`, `getmempoolancestors`, `getmempooldescendants` and
`getmempoolentry` RPC.
+=======
+>>>>>>> 46e8b87e8... Bump version to 0.20.10
diff --git a/doc/release-notes.md b/doc/release-notes/release-notes-0.20.9.md
copy from doc/release-notes.md
copy to doc/release-notes/release-notes-0.20.9.md
--- a/doc/release-notes.md
+++ b/doc/release-notes/release-notes-0.20.9.md
@@ -13,6 +13,3 @@
to relay to miners).
- Added `nTx` return value to `getblock` and `getblockheader` detailing the
number of transactions in the returned block.
- - Remove deprecated "startingpriority" and "currentpriority" from
- `getrawmempool`, `getmempoolancestors`, `getmempooldescendants` and
- `getmempoolentry` RPC.