Skip to content

Commit a4390a1

Browse files
committed
Merged revision(s) 24753 from branches/OpenMPT-1.29:
Merged revision(s) 24752 from branches/OpenMPT-1.30: Merged revision(s) 24751 from branches/OpenMPT-1.31: Merged revision(s) 24750 from branches/OpenMPT-1.32: Merged revision(s) 24749 from trunk/OpenMPT: [Var] 2026. ........ ........ ........ ........ ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.28@24754 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent f84b61b commit a4390a1

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2025, OpenMPT contributors
1+
Copyright (c) 2004-2026, OpenMPT contributors
22
Copyright (c) 1997-2003, Olivier Lapicque
33
All rights reserved.
44

common/version.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -595,12 +595,12 @@ mpt::ustring GetFullCreditsString()
595595
"libopenmpt (based on OpenMPT / ModPlug Tracker)\n"
596596
#endif
597597
"\n"
598-
"Copyright \xC2\xA9 2004-2025 Contributors\n"
598+
"Copyright \xC2\xA9 2004-2026 Contributors\n"
599599
"Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n"
600600
"\n"
601601
"Contributors:\n"
602-
"Johannes Schultz (2008-2025)\n"
603-
"J\xC3\xB6rn Heusipp (2012-2025)\n"
602+
"Johannes Schultz (2008-2026)\n"
603+
"J\xC3\xB6rn Heusipp (2012-2026)\n"
604604
"Ahti Lepp\xC3\xA4nen (2005-2011)\n"
605605
"Robin Fernandes (2004-2007)\n"
606606
"Sergiy Pylypenko (2007)\n"
@@ -786,7 +786,7 @@ mpt::ustring GetFullCreditsString()
786786
mpt::ustring GetLicenseString()
787787
{
788788
return MPT_UTF8(
789-
"Copyright (c) 2004-2025, OpenMPT contributors" "\n"
789+
"Copyright (c) 2004-2026, OpenMPT contributors" "\n"
790790
"Copyright (c) 1997-2003, Olivier Lapicque" "\n"
791791
"All rights reserved." "\n"
792792
"" "\n"

libopenmpt/in_openmpt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void config( HWND hwndParent ) {
200200
static void about( HWND hwndParent ) {
201201
std::ostringstream about;
202202
about << SHORT_TITLE << " version " << openmpt::string::get( "library_version" ) << " " << "(built " << openmpt::string::get( "build" ) << ")" << std::endl;
203-
about << " Copyright (c) 2013-2025 OpenMPT developers (https://lib.openmpt.org/)" << std::endl;
203+
about << " Copyright (c) 2013-2026 OpenMPT developers (https://lib.openmpt.org/)" << std::endl;
204204
about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl;
205205
about << std::endl;
206206
about << openmpt::string::get( "contact" ) << std::endl;

libopenmpt/libopenmpt_version.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ BEGIN
192192
VALUE "FileDescription", VER_FILEDESC_STR
193193
VALUE "FileVersion", VER_FILEVERSION_STR
194194
VALUE "InternalName", VER_FILENAME_STR
195-
VALUE "LegalCopyright", "Copyright � 2004-2025 OpenMPT contributors, Copyright � 1997-2003 Olivier Lapicque"
195+
VALUE "LegalCopyright", "Copyright � 2004-2026 OpenMPT contributors, Copyright � 1997-2003 Olivier Lapicque"
196196
VALUE "OriginalFilename", VER_FILENAME_STR
197197
VALUE "ProductName", "libopenmpt"
198198
VALUE "ProductVersion", VER_FILEVERSION_STR

libopenmpt/xmp-openmpt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ static void clear_current_timeinfo() {
452452
static void WINAPI openmpt_About( HWND win ) {
453453
std::ostringstream about;
454454
about << SHORT_TITLE << " version " << openmpt::string::get( "library_version" ) << " " << "(built " << openmpt::string::get( "build" ) << ")" << std::endl;
455-
about << " Copyright (c) 2013-2025 OpenMPT developers (https://lib.openmpt.org/)" << std::endl;
455+
about << " Copyright (c) 2013-2026 OpenMPT developers (https://lib.openmpt.org/)" << std::endl;
456456
about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl;
457457
about << std::endl;
458458
about << openmpt::string::get( "contact" ) << std::endl;

mptrack/res/MPTRACK.RC2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BEGIN
5252
VALUE "FileDescription", "OpenMPT / ModPlug Tracker"
5353
VALUE "FileVersion", VER_FILEVERSION_STR
5454
VALUE "InternalName", "ModPlug Tracker"
55-
VALUE "LegalCopyright", "Copyright �1997-2003 Olivier Lapicque; �2004-2025 contributors."
55+
VALUE "LegalCopyright", "Copyright �1997-2003 Olivier Lapicque; �2004-2026 contributors."
5656
VALUE "LegalTrademarks", "M.O.D.P.L.U.G"
5757
VALUE "OriginalFilename", "mptrack.exe"
5858
VALUE "ProductName", "OpenMPT / ModPlug Tracker"

openmpt123/openmpt123.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
static const char * const license =
11-
"Copyright (c) 2004-2025, OpenMPT contributors" "\n"
11+
"Copyright (c) 2004-2026, OpenMPT contributors" "\n"
1212
"Copyright (c) 1997-2003, Olivier Lapicque" "\n"
1313
"All rights reserved." "\n"
1414
"" "\n"
@@ -444,7 +444,7 @@ static std::string seconds_to_string( double time ) {
444444

445445
static void show_info( std::ostream & log, bool verbose ) {
446446
log << "openmpt123" << " v" << OPENMPT123_VERSION_STRING << ", libopenmpt " << openmpt::string::get( "library_version" ) << " (" << "OpenMPT " << openmpt::string::get( "core_version" ) << ")" << std::endl;
447-
log << "Copyright (c) 2013-2025 OpenMPT developers <https://lib.openmpt.org/>" << std::endl;
447+
log << "Copyright (c) 2013-2026 OpenMPT developers <https://lib.openmpt.org/>" << std::endl;
448448
if ( !verbose ) {
449449
log << std::endl;
450450
return;
@@ -533,7 +533,7 @@ static void show_info( std::ostream & log, bool verbose ) {
533533
static void show_man_version( textout & log ) {
534534
log << "openmpt123" << " v" << OPENMPT123_VERSION_STRING << std::endl;
535535
log << std::endl;
536-
log << "Copyright (c) 2013-2025 OpenMPT developers <https://lib.openmpt.org/>" << std::endl;
536+
log << "Copyright (c) 2013-2026 OpenMPT developers <https://lib.openmpt.org/>" << std::endl;
537537
}
538538

539539
static void show_short_version( textout & log ) {

0 commit comments

Comments
 (0)