aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/os.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-06 01:14:56 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-06 01:14:56 +0200
commit9b50e008890a72c76ac8da1524c06f048c9b9fd8 (patch)
tree1a1ba45051803188ec3922d7a67a92c6c058a40b /nx-X11/programs/Xserver/include/os.h
parent5cbc93678753a9933b646fbb96ccf8797fef1b93 (diff)
parent6144b615dd7ae2acd786aaa08f66c9743870b709 (diff)
downloadnx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.tar.gz
nx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.tar.bz2
nx-libs-9b50e008890a72c76ac8da1524c06f048c9b9fd8.zip
Merge branch 'sunweaver-pr/update-license-files' into 3.6.x
Attributes GH PR #182: https://github.com/ArcticaProject/nx-libs/pull/182 Reviewed by: Nicolas Arenas <narenas@qindel.com> -- Tue, 05 Jul 2016 06:15:57 -0700 Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Tue, 05 Jul 2016 09:40:04 -0700 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700 :44:48 -0700 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/include/os.h')
-rw-r--r--nx-X11/programs/Xserver/include/os.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 26ce2706c..106132b23 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -46,7 +45,6 @@ SOFTWARE.
******************************************************************/
-/* $Xorg: os.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
#ifndef OS_H
#define OS_H