summaryrefslogtreecommitdiffstats
path: root/src/mame/mame.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-06-14 16:33:21 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2022-06-14 16:33:21 +1000
commit1f26ec6836364ef523aa4e375c63186bd8fe323f (patch)
tree883f691395a7fbe71865a624844942d28124d7a8 /src/mame/mame.cpp
parent4a4b718bc9d32b4cd55a90762c960165be2f6043 (diff)
parent6741eca4d61627072710dc86f458f34a3acf7c5c (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # scripts/build/verinfo.py # scripts/resources/windows/mame/mame.rc # scripts/src/main.lua # src/mame/drivers/8080bw.cpp
Diffstat (limited to 'src/mame/mame.cpp')
-rw-r--r--src/mame/mame.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/mame.cpp b/src/mame/mame.cpp
index 217651fd510..c3fba77d580 100644
--- a/src/mame/mame.cpp
+++ b/src/mame/mame.cpp
@@ -13,8 +13,8 @@
#define APPNAME "MAME"
#define APPNAME_LOWER "mame"
#define CONFIGNAME "mame"
-#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttps://mamedev.org"
-#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
+#define COPYRIGHT "Copyright MAMEdev and contributors\nhttps://mamedev.org"
+#define COPYRIGHT_INFO "Copyright MAMEdev and contributors"
const char * emulator_info::get_appname() { return APPNAME;}
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}