Merge branch 'master' into ZSMv1

This commit is contained in:
ZeroByteOrg 2022-09-23 22:24:22 -05:00
commit c3654eb67c
138 changed files with 10160 additions and 2938 deletions

View file

@ -184,7 +184,7 @@ TAParamResult pVersion(String) {
printf("- reSID by Dag Lem (GPLv2)\n");
printf("- reSIDfp by Dag Lem, Antti Lankila and Leandro Nini (GPLv2)\n");
printf("- Stella by Stella Team (GPLv2)\n");
printf("- vgsound_emu (first version) by cam900 (BSD 3-clause)\n");
printf("- vgsound_emu (second version, modified version) by cam900 (zlib license)\n");
return TA_PARAM_QUIT;
}