From c5324f71f6ad529c810862402bf5ccba51d7249f Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 16 Nov 2012 13:07:11 -0600 Subject: [PATCH] GLUT: Fix mistake in header license * We felt that me adding this didn't really properly communicate the spirit of the email approval. You really can't just 'change' a license from MIT without author approval... so this is superfluous. --- headers/os/opengl/GL/glut.h | 2 -- src/libs/glut/glut_bitmap.c | 2 -- src/libs/glut/glut_bwidth.c | 2 -- src/libs/glut/glut_ext.c | 2 -- src/libs/glut/glut_shapes.c | 2 -- src/libs/glut/glut_stroke.c | 2 -- src/libs/glut/glut_swidth.c | 2 -- src/libs/glut/glut_teapot.c | 2 -- src/libs/glut/glut_util.c | 2 -- src/libs/glut/glut_vidresize.c | 2 -- src/libs/glut/glutbitmap.h | 2 -- src/libs/glut/glutint.h | 2 -- src/libs/glut/glutstroke.h | 2 -- 13 files changed, 26 deletions(-) diff --git a/headers/os/opengl/GL/glut.h b/headers/os/opengl/GL/glut.h index be38791bf6..e131205e70 100644 --- a/headers/os/opengl/GL/glut.h +++ b/headers/os/opengl/GL/glut.h @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_bitmap.c b/src/libs/glut/glut_bitmap.c index e136f2d8f6..a17e8d07f3 100644 --- a/src/libs/glut/glut_bitmap.c +++ b/src/libs/glut/glut_bitmap.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_bwidth.c b/src/libs/glut/glut_bwidth.c index 804ee5cebe..a72c33eab8 100644 --- a/src/libs/glut/glut_bwidth.c +++ b/src/libs/glut/glut_bwidth.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_ext.c b/src/libs/glut/glut_ext.c index 9a70deff47..83704ca0ae 100644 --- a/src/libs/glut/glut_ext.c +++ b/src/libs/glut/glut_ext.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c index 0e062ead93..1f9d84991e 100644 --- a/src/libs/glut/glut_shapes.c +++ b/src/libs/glut/glut_shapes.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_stroke.c b/src/libs/glut/glut_stroke.c index 348f6ee61c..689ccd2e2b 100644 --- a/src/libs/glut/glut_stroke.c +++ b/src/libs/glut/glut_stroke.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_swidth.c b/src/libs/glut/glut_swidth.c index e979d7109a..547aae0710 100644 --- a/src/libs/glut/glut_swidth.c +++ b/src/libs/glut/glut_swidth.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_teapot.c b/src/libs/glut/glut_teapot.c index fd1bb691b5..366bef7be1 100644 --- a/src/libs/glut/glut_teapot.c +++ b/src/libs/glut/glut_teapot.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_util.c b/src/libs/glut/glut_util.c index 88e531f025..1461fa845b 100644 --- a/src/libs/glut/glut_util.c +++ b/src/libs/glut/glut_util.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glut_vidresize.c b/src/libs/glut/glut_vidresize.c index 25f4cc3ea0..afda7bfa23 100644 --- a/src/libs/glut/glut_vidresize.c +++ b/src/libs/glut/glut_vidresize.c @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glutbitmap.h b/src/libs/glut/glutbitmap.h index f2cd07e711..830046f40b 100644 --- a/src/libs/glut/glutbitmap.h +++ b/src/libs/glut/glutbitmap.h @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glutint.h b/src/libs/glut/glutint.h index 66e5ab5dce..6f3d7241ef 100644 --- a/src/libs/glut/glutint.h +++ b/src/libs/glut/glutint.h @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */ diff --git a/src/libs/glut/glutstroke.h b/src/libs/glut/glutstroke.h index 370b53593a..12d3235f5a 100644 --- a/src/libs/glut/glutstroke.h +++ b/src/libs/glut/glutstroke.h @@ -2,8 +2,6 @@ * Copyright 1994-1997 Mark Kilgard, All rights reserved. * Distributed under the terms of the MIT License. * - * GPL licensing not permitted. - * * Authors: * Mark Kilgard */