From 8dbe75876129e9d5d689e42e04e6c797d1c1b6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Tue, 31 Dec 2024 10:14:44 +0000 Subject: [PATCH] Merged revision(s) 22658 from trunk/OpenMPT: [Var] It's 2025 now (on Kiritimati). ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@22660 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- LICENSE | 2 +- common/version.cpp | 8 ++++---- contrib/libmodplug-0.8.8.5/LICENSE | 2 +- contrib/libmodplug-0.8.9.0/LICENSE | 2 +- installer/install-multi-arch.iss | 2 +- libopenmpt/in_openmpt.cpp | 2 +- libopenmpt/libopenmpt_version.rc | 2 +- libopenmpt/xmp-openmpt.cpp | 2 +- mptrack/res/MPTRACK.RC2 | 2 +- openmpt123/openmpt123.cpp | 6 +++--- pluginBridge/PluginBridge.rc | 2 +- src/mpt/LICENSE.BSD-3-Clause.txt | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index c9db5fcfc04..d916fe2fcec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors +Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors Copyright (c) 1997-2003, Olivier Lapicque All rights reserved. diff --git a/common/version.cpp b/common/version.cpp index f8db361ac46..a599cc7634c 100644 --- a/common/version.cpp +++ b/common/version.cpp @@ -592,12 +592,12 @@ mpt::ustring GetFullCreditsString() "libopenmpt (based on OpenMPT / Open ModPlug Tracker)\n" #endif "\n" - "Copyright \xC2\xA9 2004-2024 OpenMPT Project Developers and Contributors\n" + "Copyright \xC2\xA9 2004-2025 OpenMPT Project Developers and Contributors\n" "Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n" "\n" "Developers:\n" - "Johannes Schultz (2008-2024)\n" - "J\xC3\xB6rn Heusipp (2012-2024)\n" + "Johannes Schultz (2008-2025)\n" + "J\xC3\xB6rn Heusipp (2012-2025)\n" "Ahti Lepp\xC3\xA4nen (2005-2011)\n" "Robin Fernandes (2004-2007)\n" "Sergiy Pylypenko (2007)\n" @@ -792,7 +792,7 @@ mpt::ustring GetFullCreditsString() mpt::ustring GetLicenseString() { return MPT_UTF8( - "Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors" "\n" + "Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors" "\n" "Copyright (c) 1997-2003, Olivier Lapicque" "\n" "All rights reserved." "\n" "" "\n" diff --git a/contrib/libmodplug-0.8.8.5/LICENSE b/contrib/libmodplug-0.8.8.5/LICENSE index c9db5fcfc04..d916fe2fcec 100644 --- a/contrib/libmodplug-0.8.8.5/LICENSE +++ b/contrib/libmodplug-0.8.8.5/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors +Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors Copyright (c) 1997-2003, Olivier Lapicque All rights reserved. diff --git a/contrib/libmodplug-0.8.9.0/LICENSE b/contrib/libmodplug-0.8.9.0/LICENSE index c9db5fcfc04..d916fe2fcec 100644 --- a/contrib/libmodplug-0.8.9.0/LICENSE +++ b/contrib/libmodplug-0.8.9.0/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors +Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors Copyright (c) 1997-2003, Olivier Lapicque All rights reserved. diff --git a/installer/install-multi-arch.iss b/installer/install-multi-arch.iss index f0a670d8114..59c4f6295ac 100644 --- a/installer/install-multi-arch.iss +++ b/installer/install-multi-arch.iss @@ -47,7 +47,7 @@ SetupIconFile=..\mptrack\res\MPTRACK.ICO SolidCompression=yes TimeStampsInUTC=yes UninstallDisplayIcon={app}\OpenMPT App Icon.ico -VersionInfoCopyright=Copyright © 2004-2024 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque +VersionInfoCopyright=Copyright © 2004-2025 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque VersionInfoProductTextVersion={#GetAppVersion} VersionInfoProductVersion={#GetAppVersion} VersionInfoTextVersion={#GetAppVersion} diff --git a/libopenmpt/in_openmpt.cpp b/libopenmpt/in_openmpt.cpp index 3dca03d3922..4a940dfa160 100644 --- a/libopenmpt/in_openmpt.cpp +++ b/libopenmpt/in_openmpt.cpp @@ -262,7 +262,7 @@ static void config( HWND hwndParent ) { static void about( HWND hwndParent ) { std::ostringstream about; about << SHORT_TITLE << " version " << openmpt::string::get( "library_version" ) << " " << "(built " << openmpt::string::get( "build" ) << ")" << std::endl; - about << " Copyright (c) 2013-2024 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl; + about << " Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl; about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl; about << std::endl; about << openmpt::string::get( "contact" ) << std::endl; diff --git a/libopenmpt/libopenmpt_version.rc b/libopenmpt/libopenmpt_version.rc index bd35f7ac41c..37bc9ccdde7 100644 --- a/libopenmpt/libopenmpt_version.rc +++ b/libopenmpt/libopenmpt_version.rc @@ -192,7 +192,7 @@ BEGIN VALUE "FileDescription", VER_FILEDESC_STR VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", VER_FILENAME_STR - VALUE "LegalCopyright", "Copyright © 2004-2024 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque" + VALUE "LegalCopyright", "Copyright © 2004-2025 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque" VALUE "OriginalFilename", VER_FILENAME_STR VALUE "ProductName", "libopenmpt" VALUE "ProductVersion", VER_FILEVERSION_STR diff --git a/libopenmpt/xmp-openmpt.cpp b/libopenmpt/xmp-openmpt.cpp index bf71dcd896e..d8a02f49b72 100644 --- a/libopenmpt/xmp-openmpt.cpp +++ b/libopenmpt/xmp-openmpt.cpp @@ -519,7 +519,7 @@ static void clear_current_timeinfo() { static void WINAPI openmpt_About( HWND win ) { std::ostringstream about; about << SHORT_TITLE << " version " << openmpt::string::get( "library_version" ) << " " << "(built " << openmpt::string::get( "build" ) << ")" << std::endl; - about << " Copyright (c) 2013-2024 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl; + about << " Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl; about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl; about << std::endl; about << openmpt::string::get( "contact" ) << std::endl; diff --git a/mptrack/res/MPTRACK.RC2 b/mptrack/res/MPTRACK.RC2 index e37d1801b6e..22a8b395b55 100644 --- a/mptrack/res/MPTRACK.RC2 +++ b/mptrack/res/MPTRACK.RC2 @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", VER_FILEDESCRIPTION VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "OpenMPT" - VALUE "LegalCopyright", "Copyright © 2004-2024 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque" + VALUE "LegalCopyright", "Copyright © 2004-2025 OpenMPT Project Developers and Contributors, Copyright © 1997-2003 Olivier Lapicque" VALUE "OriginalFilename", "OpenMPT.exe" VALUE "ProductName", "OpenMPT" VALUE "ProductVersion", VER_FILEVERSION_STR diff --git a/openmpt123/openmpt123.cpp b/openmpt123/openmpt123.cpp index c579bb8ba7e..bc6a63bd473 100644 --- a/openmpt123/openmpt123.cpp +++ b/openmpt123/openmpt123.cpp @@ -8,7 +8,7 @@ */ static const char * const license = -"Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors" "\n" +"Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors" "\n" "Copyright (c) 1997-2003, Olivier Lapicque" "\n" "All rights reserved." "\n" "" "\n" @@ -466,7 +466,7 @@ static std::string seconds_to_string( double time ) { static void show_info( std::ostream & log, bool verbose ) { log << "openmpt123" << " v" << OPENMPT123_VERSION_STRING << ", libopenmpt " << openmpt::string::get( "library_version" ) << " (" << "OpenMPT " << openmpt::string::get( "core_version" ) << ")" << std::endl; - log << "Copyright (c) 2013-2024 OpenMPT Project Developers and Contributors " << std::endl; + log << "Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors " << std::endl; if ( !verbose ) { log << std::endl; return; @@ -543,7 +543,7 @@ static void show_info( std::ostream & log, bool verbose ) { static void show_man_version( textout & log ) { log << "openmpt123" << " v" << OPENMPT123_VERSION_STRING << std::endl; log << std::endl; - log << "Copyright (c) 2013-2024 OpenMPT Project Developers and Contributors " << std::endl; + log << "Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors " << std::endl; } static void show_short_version( textout & log ) { diff --git a/pluginBridge/PluginBridge.rc b/pluginBridge/PluginBridge.rc index a11ff0217f0..03c69f755a5 100644 --- a/pluginBridge/PluginBridge.rc +++ b/pluginBridge/PluginBridge.rc @@ -80,7 +80,7 @@ BEGIN VALUE "FileDescription", "OpenMPT Plugin Bridge" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "PluginBridge.exe" - VALUE "LegalCopyright", "Copyright © 2013-2024 OpenMPT Project Developers and Contributors" + VALUE "LegalCopyright", "Copyright © 2013-2025 OpenMPT Project Developers and Contributors" VALUE "OriginalFilename", "PluginBridge.exe" VALUE "ProductName", "OpenMPT" VALUE "ProductVersion", VER_FILEVERSION_STR diff --git a/src/mpt/LICENSE.BSD-3-Clause.txt b/src/mpt/LICENSE.BSD-3-Clause.txt index f1628b1f8ec..07141c05b85 100644 --- a/src/mpt/LICENSE.BSD-3-Clause.txt +++ b/src/mpt/LICENSE.BSD-3-Clause.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors +Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors Copyright (c) 1997-2003, Olivier Lapicque All rights reserved.