diff options
Diffstat (limited to 'nx-X11/extras')
| -rw-r--r-- | nx-X11/extras/Mesa/include/GL/internal/glcore.h | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/glx/x11/compsize.c | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h | 17 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/main/enums.h | 1 |
5 files changed, 10 insertions, 11 deletions
diff --git a/nx-X11/extras/Mesa/include/GL/internal/glcore.h b/nx-X11/extras/Mesa/include/GL/internal/glcore.h index 9626dc698..e0b06c7ca 100644 --- a/nx-X11/extras/Mesa/include/GL/internal/glcore.h +++ b/nx-X11/extras/Mesa/include/GL/internal/glcore.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.7 2001/03/25 05:32:00 tsi Exp $ */ #ifndef __gl_core_h_ #define __gl_core_h_ diff --git a/nx-X11/extras/Mesa/src/glx/x11/compsize.c b/nx-X11/extras/Mesa/src/glx/x11/compsize.c index 193570c84..34d66774c 100644 --- a/nx-X11/extras/Mesa/src/glx/x11/compsize.c +++ b/nx-X11/extras/Mesa/src/glx/x11/compsize.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/glx/compsize.c,v 1.6 2004/01/28 18:11:38 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c index 6ec65faa9..780ec98d9 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c @@ -21,7 +21,6 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/X/xm_span.c,v 1.3 2002/02/27 21:07:54 tsi Exp $ */ #include "glxheader.h" #include "colormac.h" diff --git a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h index b4d805d6d..bf6ea040c 100644 --- a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h +++ b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h @@ -1,15 +1,18 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ +/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */ +/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ +/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */ +/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */ +/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ -/* are copyright of NoMachine. Redistribution and use of the present */ -/* software is allowed according to terms specified in the file LICENSE */ -/* which comes in the source distribution. */ +/* are copyright of the aforementioned persons and companies. */ /* */ -/* Check http://www.nomachine.com/licensing.html for applicability. */ -/* */ -/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +/* Redistribution and use of the present software is allowed according */ +/* to terms specified in the file LICENSE which comes in the source */ +/* distribution. */ /* */ /* All rights reserved. */ /* */ diff --git a/nx-X11/extras/Mesa/src/mesa/main/enums.h b/nx-X11/extras/Mesa/src/mesa/main/enums.h index 7e8d4ee94..10ede1fa0 100644 --- a/nx-X11/extras/Mesa/src/mesa/main/enums.h +++ b/nx-X11/extras/Mesa/src/mesa/main/enums.h @@ -31,7 +31,6 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/mesa/main/enums.h,v 1.2 2004/06/23 19:40:14 tsi Exp $ */ #ifndef _ENUMS_H_ #define _ENUMS_H_ |