Skip to content

Commit

Permalink
Merged revision(s) 22658 from trunk/OpenMPT:
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@manxorist
manxorist committed Dec 31, 2024
1 parent b1d9940 commit 8dbe758
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
8 changes: 4 additions & 4 deletions common/version.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/libmodplug-0.8.8.5/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion contrib/libmodplug-0.8.9.0/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion installer/install-multi-arch.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion libopenmpt/in_openmpt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion libopenmpt/libopenmpt_version.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libopenmpt/xmp-openmpt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mptrack/res/MPTRACK.RC2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions openmpt123/openmpt123.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 <https://lib.openmpt.org/>" << std::endl;
log << "Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors <https://lib.openmpt.org/>" << std::endl;
if ( !verbose ) {
log << std::endl;
return;
Expand Down Expand Up @@ -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 <https://lib.openmpt.org/>" << std::endl;
log << "Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors <https://lib.openmpt.org/>" << std::endl;
}

static void show_short_version( textout & log ) {
Expand Down
2 changes: 1 addition & 1 deletion pluginBridge/PluginBridge.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/mpt/LICENSE.BSD-3-Clause.txt
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand Down

0 comments on commit 8dbe758

Please sign in to comment.