Merge remote-tracking branch 'upstream/25.x' into 25.0.0

Groestlcoin · May 26, 2023 · 9bf059c · 9bf059c
2 parents aa1ff7b + 725c3dc
commit 9bf059c
Show file tree

Hide file tree

Showing 12 changed files with 576 additions and 27 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 25)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/doc/man/groestlcoin-cli.1 b/doc/man/groestlcoin-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIN-CLI "1" "June 2023" "groestlcoin-cli v25.0.0rc2" "User Commands"
+.TH GROESTLCOIN-CLI "1" "June 2023" "groestlcoin-cli v25.0.0" "User Commands"
 .SH NAME
-groestlcoin-cli \- manual page for groestlcoin-cli v25.0.0rc2
+groestlcoin-cli \- manual page for groestlcoin-cli v25.0.0
 .SH SYNOPSIS
 .B groestlcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Groestlcoin Core\/\fR
@@ -15,7 +15,7 @@ groestlcoin-cli \- manual page for groestlcoin-cli v25.0.0rc2
 .B groestlcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Groestlcoin Core RPC client version v25.0.0rc2
+Groestlcoin Core RPC client version v25.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/groestlcoin-qt.1 b/doc/man/groestlcoin-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIN-QT "1" "June 2023" "groestlcoin-qt v25.0.0rc2" "User Commands"
+.TH GROESTLCOIN-QT "1" "June 2023" "groestlcoin-qt v25.0.0" "User Commands"
 .SH NAME
-groestlcoin-qt \- manual page for groestlcoin-qt v25.0.0rc2
+groestlcoin-qt \- manual page for groestlcoin-qt v25.0.0
 .SH SYNOPSIS
 .B groestlcoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Groestlcoin Core versie v25.0.0rc2
+Groestlcoin Core versie v25.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/groestlcoin-tx.1 b/doc/man/groestlcoin-tx.1
@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIN-TX "1" "June 2023" "groestlcoin-tx v25.0.0rc2" "User Commands"
+.TH GROESTLCOIN-TX "1" "June 2023" "groestlcoin-tx v25.0.0" "User Commands"
 .SH NAME
-groestlcoin-tx \- manual page for groestlcoin-tx v25.0.0rc2
+groestlcoin-tx \- manual page for groestlcoin-tx v25.0.0
 .SH SYNOPSIS
 .B groestlcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded groestlcoin transaction\/\fR
 .br
 .B groestlcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded groestlcoin transaction\/\fR
 .SH DESCRIPTION
-Groestlcoin Core groestlcoin\-tx utility version v25.0.0rc2
+Groestlcoin Core groestlcoin\-tx utility version v25.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/groestlcoin-util.1 b/doc/man/groestlcoin-util.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIN-UTIL "1" "June 2023" "groestlcoin-util v25.0.0rc2" "User Commands"
+.TH GROESTLCOIN-UTIL "1" "June 2023" "groestlcoin-util v25.0.0" "User Commands"
 .SH NAME
-groestlcoin-util \- manual page for groestlcoin-util v25.0.0rc2
+groestlcoin-util \- manual page for groestlcoin-util v25.0.0
 .SH SYNOPSIS
 .B groestlcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Groestlcoin Core groestlcoin\-util utility version v25.0.0rc2
+Groestlcoin Core groestlcoin\-util utility version v25.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/groestlcoin-wallet.1 b/doc/man/groestlcoin-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIN-WALLET "1" "June 2023" "groestlcoin-wallet v25.0.0rc2" "User Commands"
+.TH GROESTLCOIN-WALLET "1" "June 2023" "groestlcoin-wallet v25.0.0" "User Commands"
 .SH NAME
-groestlcoin-wallet \- manual page for groestlcoin-wallet v25.0.0rc2
+groestlcoin-wallet \- manual page for groestlcoin-wallet v25.0.0
 .SH DESCRIPTION
-Groestlcoin Core groestlcoin\-wallet version v25.0.0rc2
+Groestlcoin Core groestlcoin\-wallet version v25.0.0
 .PP
 groestlcoin\-wallet is an offline tool for creating and interacting with Groestlcoin Core wallet files.
 By default groestlcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

diff --git a/doc/man/groestlcoind.1 b/doc/man/groestlcoind.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
-.TH GROESTLCOIND "1" "June 2023" "groestlcoind v25.0.0rc2" "User Commands"
+.TH GROESTLCOIND "1" "June 2023" "groestlcoind v25.0.0" "User Commands"
 .SH NAME
-groestlcoind \- manual page for groestlcoind v25.0.0rc2
+groestlcoind \- manual page for groestlcoind v25.0.0
 .SH SYNOPSIS
 .B groestlcoind
 [\fI\,options\/\fR]                     \fI\,Start Groestlcoin Core\/\fR
 .SH DESCRIPTION
-Groestlcoin Core version v25.0.0rc2
+Groestlcoin Core version v25.0.0
 .SH OPTIONS
 .HP
 \-?