diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/LockDis.c | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/LockDis.c')
| -rw-r--r-- | nx-X11/lib/X11/LockDis.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/LockDis.c b/nx-X11/lib/X11/LockDis.c index c4f00e661..12dd97df0 100644 --- a/nx-X11/lib/X11/LockDis.c +++ b/nx-X11/lib/X11/LockDis.c @@ -1,6 +1,6 @@ /* - + Copyright 1993, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +24,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ /* * Author: Stephen Gildea, MIT X Consortium |