From 4f117b7751856753d440ae100d13c8400c1f04fe Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 29 Jul 2016 17:33:39 -0400 Subject: [PATCH] Haiku's GLUT has been licensed under the MIT license since 2012... ... as we obtained permission from Mark Kilgard to do so (see commit c3eddfc0682b99f28ddbe33a14dadc40dc5b5f71.) So update AboutSystem and the licenses directory to reflect that. --- data/system/data/licenses/GLUT (Mark Kilgard) | 5 ----- src/apps/aboutsystem/AboutSystem.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 data/system/data/licenses/GLUT (Mark Kilgard) diff --git a/data/system/data/licenses/GLUT (Mark Kilgard) b/data/system/data/licenses/GLUT (Mark Kilgard) deleted file mode 100644 index f8a501370a..0000000000 --- a/data/system/data/licenses/GLUT (Mark Kilgard) +++ /dev/null @@ -1,5 +0,0 @@ -/* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */ - -/* This program is freely distributable without licensing fees - and is provided without guarantee or warrantee expressed or - implied. This program is -not- in the public domain. */ diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index d00ebbce25..ae84c4f9bc 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1178,7 +1178,7 @@ AboutView::_CreateCreditsView() COPYRIGHT_STRING "1997 Be Inc.", COPYRIGHT_STRING "1999 Jake Hamby.", NULL) - .SetLicense("GLUT (Mark Kilgard)") + .SetLicense("MIT") .SetURL("http://www.opengl.org/resources/libraries/glut")); // OpenGroup & DEC (BRegion backend) copyright