diff options
| author | glozow <gloriajzhao@gmail.com> | 2024-06-12 12:56:42 +0100 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2024-06-12 13:06:12 +0100 |
| commit | d10cf127e576a8066a417aa77d49a6c726cb16af (patch) | |
| tree | f055008d698ade109321a407b588f43bc56f0a4b /configure.ac | |
| parent | 6d7a1e3670675fe4bcdd9b2df9bce7979ecd90fc (diff) | |
| parent | 7ca424f8e651707effe1380aaf72d9ad0e97aa18 (diff) | |
Merge bitcoin/bitcoin#30260: [26.x] backports and final changes for 26.2rc1v26.2rc1
7ca424f8e651707effe1380aaf72d9ad0e97aa18 [doc] update release notes for 26.2rc1 (glozow)
03a91a0142ceaec369154151fba928b56aae6f08 [doc] manpages for 26.2rc1 (glozow)
4c824bbe03e61dab5665f59903d368ce3cc514d2 [build] bump to version 26.2rc1 (glozow)
b99229737d2416983136a91b8cf93c5af53ab924 qt: 26.2rc1 translations update (Hennadii Stepanov)
7b2489f57ff76dd6f25713e10deed0529a0d2111 depends: Fetch miniupnpc sources from an alternative website (Hennadii Stepanov)
Pull request description:
Backports + release notes for:
- #30151
And final changes for 26.2rc1:
- build changes
- manpages
- non-removal translations updates
ACKs for top commit:
stickies-v:
ACK 7ca424f8e651707effe1380aaf72d9ad0e97aa18
fanquake:
ACK 7ca424f8e651707effe1380aaf72d9ad0e97aa18
Tree-SHA512: 881697eb6fb78261e3deb5064d6f38227b449049add810c7da999a1f22fad60b9dd32057c626bbfaa7e461d53635cd2f7a9fb225eba0f6fb503afd4f1ef6c46d
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5a7baf2a77..847c747b90 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 26) -define(_CLIENT_VERSION_MINOR, 1) +define(_CLIENT_VERSION_MINOR, 2) 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]) |