Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/26.x' into 26.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gruve-p committed Oct 30, 2023
2 parents 62bc2c4 + 11254a3 commit 13bf8b4
Show file tree
Hide file tree
Showing 145 changed files with 17,591 additions and 14,261 deletions.
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 25)
define(_CLIENT_VERSION_MINOR, 99)
define(_CLIENT_VERSION_MAJOR, 26)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
8 changes: 7 additions & 1 deletion doc/man/groestlcoin-cli.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
.SH NAME
groestlcoin-cli \- manual page for groestlcoin-cli

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
8 changes: 7 additions & 1 deletion doc/man/groestlcoin-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
.SH NAME
groestlcoin-qt \- manual page for groestlcoin-qt

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
8 changes: 7 additions & 1 deletion doc/man/groestlcoin-tx.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
.SH NAME
groestlcoin-tx \- manual page for groestlcoin-tx

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
8 changes: 7 additions & 1 deletion doc/man/groestlcoind.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
.SH NAME
groestlcoind \- manual page for groestlcoind

This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release.
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org/> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>
5 changes: 0 additions & 5 deletions doc/release-notes-123.md

This file was deleted.

9 changes: 0 additions & 9 deletions doc/release-notes-24914.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-25158.md

This file was deleted.

13 changes: 0 additions & 13 deletions doc/release-notes-26076.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-26094.md

This file was deleted.

16 changes: 0 additions & 16 deletions doc/release-notes-26485.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-27213.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-27302.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-27460.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes-27501.md

This file was deleted.

28 changes: 0 additions & 28 deletions doc/release-notes-27596.md

This file was deleted.

14 changes: 0 additions & 14 deletions doc/release-notes-27609.md

This file was deleted.

5 changes: 0 additions & 5 deletions doc/release-notes-27632.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes-27757.md

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes-28113.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-28354.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-28414.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes-28448.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/release-notes-28685.md

This file was deleted.

95 changes: 0 additions & 95 deletions doc/release-notes-empty-template.md

This file was deleted.

6 changes: 0 additions & 6 deletions doc/release-notes/release-notes-27511.md

This file was deleted.

6 changes: 4 additions & 2 deletions src/Makefile.qt_locale.include
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ QT_TS = \
qt/locale/bitcoin_fa.ts \
qt/locale/bitcoin_fi.ts \
qt/locale/bitcoin_fil.ts \
qt/locale/bitcoin_fo.ts \
qt/locale/bitcoin_fr.ts \
qt/locale/bitcoin_fr_CM.ts \
qt/locale/bitcoin_fr_LU.ts \
Expand All @@ -49,9 +50,9 @@ QT_TS = \
qt/locale/bitcoin_id.ts \
qt/locale/bitcoin_is.ts \
qt/locale/bitcoin_it.ts \
qt/locale/bitcoin_ja.ts \
qt/locale/bitcoin_ka.ts \
qt/locale/bitcoin_kk.ts \
qt/locale/[email protected] \
qt/locale/bitcoin_kl.ts \
qt/locale/bitcoin_km.ts \
qt/locale/bitcoin_kn.ts \
Expand All @@ -60,6 +61,7 @@ QT_TS = \
qt/locale/bitcoin_ku_IQ.ts \
qt/locale/bitcoin_ky.ts \
qt/locale/bitcoin_la.ts \
qt/locale/bitcoin_lb.ts \
qt/locale/bitcoin_lt.ts \
qt/locale/bitcoin_lv.ts \
qt/locale/bitcoin_mg.ts \
Expand All @@ -69,6 +71,7 @@ QT_TS = \
qt/locale/bitcoin_mr.ts \
qt/locale/bitcoin_mr_IN.ts \
qt/locale/bitcoin_ms.ts \
qt/locale/bitcoin_mt.ts \
qt/locale/bitcoin_my.ts \
qt/locale/bitcoin_nb.ts \
qt/locale/bitcoin_ne.ts \
Expand All @@ -78,7 +81,6 @@ QT_TS = \
qt/locale/bitcoin_pam.ts \
qt/locale/bitcoin_pl.ts \
qt/locale/bitcoin_pt.ts \
qt/locale/[email protected] \
qt/locale/bitcoin_pt_BR.ts \
qt/locale/bitcoin_ro.ts \
qt/locale/bitcoin_ru.ts \
Expand Down
Loading

0 comments on commit 13bf8b4

Please sign in to comment.