Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22662 - in branches/OpenMPT-1.28: . common libopenmpt mptrack/res openmpt123
|
From: <sv...@op...> - 2024-12-31 10:21:38
|
Author: manx Date: Tue Dec 31 11:21:31 2024 New Revision: 22662 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22662 Log: Merged revision(s) 22661 from branches/OpenMPT-1.29: [Var] It's 2025 now (on Kiritimati). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/LICENSE branches/OpenMPT-1.28/common/version.cpp branches/OpenMPT-1.28/libopenmpt/ (props changed) branches/OpenMPT-1.28/libopenmpt/in_openmpt.cpp branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.rc branches/OpenMPT-1.28/libopenmpt/xmp-openmpt.cpp branches/OpenMPT-1.28/mptrack/res/MPTRACK.RC2 branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.28/LICENSE ============================================================================== --- branches/OpenMPT-1.28/LICENSE Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/LICENSE Tue Dec 31 11:21:31 2024 (r22662) @@ -1,4 +1,4 @@ -Copyright (c) 2004-2024, OpenMPT contributors +Copyright (c) 2004-2025, OpenMPT contributors Copyright (c) 1997-2003, Olivier Lapicque All rights reserved. Modified: branches/OpenMPT-1.28/common/version.cpp ============================================================================== --- branches/OpenMPT-1.28/common/version.cpp Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/common/version.cpp Tue Dec 31 11:21:31 2024 (r22662) @@ -595,12 +595,12 @@ "libopenmpt (based on OpenMPT / ModPlug Tracker)\n" #endif "\n" - "Copyright \xC2\xA9 2004-2024 Contributors\n" + "Copyright \xC2\xA9 2004-2025 Contributors\n" "Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n" "\n" "Contributors:\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" @@ -786,7 +786,7 @@ mpt::ustring GetLicenseString() { return MPT_UTF8( - "Copyright (c) 2004-2024, OpenMPT contributors" "\n" + "Copyright (c) 2004-2025, OpenMPT contributors" "\n" "Copyright (c) 1997-2003, Olivier Lapicque" "\n" "All rights reserved." "\n" "" "\n" Modified: branches/OpenMPT-1.28/libopenmpt/in_openmpt.cpp ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/in_openmpt.cpp Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/libopenmpt/in_openmpt.cpp Tue Dec 31 11:21:31 2024 (r22662) @@ -200,7 +200,7 @@ 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 developers (https://lib.openmpt.org/)" << std::endl; + about << " Copyright (c) 2013-2025 OpenMPT developers (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; Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.rc ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.rc Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.rc Tue Dec 31 11:21:31 2024 (r22662) @@ -192,7 +192,7 @@ VALUE "FileDescription", VER_FILEDESC_STR VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", VER_FILENAME_STR - VALUE "LegalCopyright", "Copyright 2004-2024 OpenMPT contributors, Copyright 1997-2003 Olivier Lapicque" + VALUE "LegalCopyright", "Copyright 2004-2025 OpenMPT contributors, Copyright 1997-2003 Olivier Lapicque" VALUE "OriginalFilename", VER_FILENAME_STR VALUE "ProductName", "libopenmpt" VALUE "ProductVersion", VER_FILEVERSION_STR Modified: branches/OpenMPT-1.28/libopenmpt/xmp-openmpt.cpp ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/xmp-openmpt.cpp Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/libopenmpt/xmp-openmpt.cpp Tue Dec 31 11:21:31 2024 (r22662) @@ -452,7 +452,7 @@ 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 developers (https://lib.openmpt.org/)" << std::endl; + about << " Copyright (c) 2013-2025 OpenMPT developers (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; Modified: branches/OpenMPT-1.28/mptrack/res/MPTRACK.RC2 ============================================================================== --- branches/OpenMPT-1.28/mptrack/res/MPTRACK.RC2 Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/mptrack/res/MPTRACK.RC2 Tue Dec 31 11:21:31 2024 (r22662) @@ -52,7 +52,7 @@ VALUE "FileDescription", "OpenMPT / ModPlug Tracker" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "ModPlug Tracker" - VALUE "LegalCopyright", "Copyright 1997-2003 Olivier Lapicque; 2004-2024 contributors." + VALUE "LegalCopyright", "Copyright 1997-2003 Olivier Lapicque; 2004-2025 contributors." VALUE "LegalTrademarks", "M.O.D.P.L.U.G" VALUE "OriginalFilename", "mptrack.exe" VALUE "ProductName", "OpenMPT / ModPlug Tracker" Modified: branches/OpenMPT-1.28/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Tue Dec 31 11:20:23 2024 (r22661) +++ branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Tue Dec 31 11:21:31 2024 (r22662) @@ -8,7 +8,7 @@ */ static const char * const license = -"Copyright (c) 2004-2024, OpenMPT contributors" "\n" +"Copyright (c) 2004-2025, OpenMPT contributors" "\n" "Copyright (c) 1997-2003, Olivier Lapicque" "\n" "All rights reserved." "\n" "" "\n" @@ -444,7 +444,7 @@ 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 developers <https://lib.openmpt.org/>" << std::endl; + log << "Copyright (c) 2013-2025 OpenMPT developers <https://lib.openmpt.org/>" << std::endl; if ( !verbose ) { log << std::endl; return; @@ -533,7 +533,7 @@ static void show_man_version( textout & log ) { log << "openmpt123" << " v" << OPENMPT123_VERSION_STRING << std::endl; log << std::endl; - log << "Copyright (c) 2013-2024 OpenMPT developers <https://lib.openmpt.org/>" << std::endl; + log << "Copyright (c) 2013-2025 OpenMPT developers <https://lib.openmpt.org/>" << std::endl; } static void show_short_version( textout & log ) { |
