Skip to content

Commit 9f4f549

Browse files
adriwebcalc84maniac
authored andcommitted
Update some license things
1 parent 20737ac commit 9f4f549

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

LICENSE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CEmu is licensed under the GPLv3 - https://www.gnu.org/licenses/gpl-3.0.en.html
22

3-
Copyright (C) 2015-2019 CEmu contributors
3+
Copyright (C) 2015-2024 CEmu contributors
44

55
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
66

@@ -15,6 +15,7 @@ Portions of this program use code, directly or modified, from:
1515
* tivars_lib_cpp, developed by Adrien "Adriweb" Bertrand
1616
* KDMacTouchBar, developed by KDAB
1717
* FatCow's "Farm-Fresh Web Icons" (CC 3.0 license) - http://www.fatcow.com/free-icons
18+
* ATMEL's CMSIS & SAMD21A resources (see core/arm/README.md)
1819

1920
CEmu also uses the APNG-enabled fork of libpng (https://sourceforge.net/projects/libpng-apng/) released under the zlib/libpng License.
2021

@@ -46,7 +47,7 @@ ________________________________________________________
4647
tivars_lib_cpp license:
4748

4849
The MIT License (MIT)
49-
Copyright (c) 2015-2019 Adrien Bertrand
50+
Copyright (c) 2015-2024 Adrien Bertrand
5051

5152
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5253

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ We also welcome more translations. Qt Linguist is a great tool for that (here's
8484

8585
## License
8686
CEmu is licensed under the [GPLv3](LICENSE).
87-
_Acknowledgements_: Some CEmu parts are, directly, modified, or inspired, from [z80e](https://github.com/KnightOS/z80e), [Firebird](https://github.com/nspire-emus/firebird), [libtifiles](https://github.com/debrouxl/tilibs), [tivars_lib_cpp](https://github.com/adriweb/tivars_lib_cpp), [KDMacTouchBar](https://github.com/KDAB/KDMacTouchBar), [TinyCThread](https://github.com/gyrovorbis/tinycthread) (_gyrovorbis_'s fork), and FatCow's ["Farm-Fresh Web Icons"](http://www.fatcow.com/free-icons).
87+
_Acknowledgements_: Some CEmu parts are, directly, modified, or inspired, from [z80e](https://github.com/KnightOS/z80e), [Firebird](https://github.com/nspire-emus/firebird), [libtifiles](https://github.com/debrouxl/tilibs), [tivars_lib_cpp](https://github.com/adriweb/tivars_lib_cpp), [KDMacTouchBar](https://github.com/KDAB/KDMacTouchBar), [TinyCThread](https://github.com/gyrovorbis/tinycthread) (_gyrovorbis_'s fork), ATMEL's [CMSIS & SAMD21A resources](core/arm/README.md), and FatCow's ["Farm-Fresh Web Icons"](http://www.fatcow.com/free-icons).
8888
The complete licensing information is available in the [LICENSE](LICENSE) file.

0 commit comments

Comments
 (0)