REDCODE/spice2x-r3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
bicarus-dev
2026-08-22 21:53:03 -07:00
parent e7b90271ca
commit 09314f1fd3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/licenses.txt
+6 -7
View File
@@ -1428,7 +1428,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Wslay UTF-8 decoder (MIT)
-------------------------------------------
Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1448,11 +1447,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Contributions
-------------------------------------------
cardio - Felix - MIT License
scard - nolm - MIT License
x264 (GPL-2.0-or-later)
-------------------------------------------
https://www.videolan.org/developers/x264.html
@@ -1471,4 +1465,9 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
Street, Fifth Floor, Boston, MA 02110-1301, USA.
Street, Fifth Floor, Boston, MA 02110-1301, USA.
Contributions
-------------------------------------------
cardio - Felix - MIT License
scard - nolm - MIT License