From 09314f1fd34062386052815312944a12af812624 Mon Sep 17 00:00:00 2001 From: bicarus-dev <202771338+bicarus-dev@users.noreply.github.com> Date: Sat, 22 Aug 2026 21:52:44 -0700 Subject: [PATCH] fix bad merge --- src/spice2x/licenses.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/spice2x/licenses.txt b/src/spice2x/licenses.txt index 9021636..9aabf7a 100644 --- a/src/spice2x/licenses.txt +++ b/src/spice2x/licenses.txt @@ -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 -Copyright (c) 2008-2009 Bjoern Hoehrmann 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. \ No newline at end of file +Street, Fifth Floor, Boston, MA 02110-1301, USA. + +Contributions +------------------------------------------- +cardio - Felix - MIT License +scard - nolm - MIT License