Merge master into fix-7e418 and resolve conflicts by keeping v1.4.2

This commit is contained in:
2025-11-18 10:30:32 +01:00

View File

@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 1
/* Minor version */
#define CLIENT_VERSION_MINOR 4
#define CLIENT_VERSION_MINOR 5
/* Build revision */
#define CLIENT_VERSION_REVISION 2
@@ -265,7 +265,7 @@
#define PACKAGE_NAME "Palladium Core"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Palladium Core 1.4.1"
#define PACKAGE_STRING "Palladium Core 1.5.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "palladium"
@@ -274,7 +274,7 @@
#define PACKAGE_URL "https://palladiumblockchain.net/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.4.1"
#define PACKAGE_VERSION "1.5.0"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */