diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
| commit | b66699555d2e2503926f01a9c192481e01812399 (patch) | |
| tree | fa7f275b0bc74c3ed8e85538602ed8b6a8a0f4c2 /nx-X11/programs/Xserver/hw/nxagent/Atoms.h | |
| parent | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (diff) | |
| parent | 97a69b95ac3018f9a8838b09df28a0f33c484a0d (diff) | |
| download | nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.gz nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.bz2 nx-libs-b66699555d2e2503926f01a9c192481e01812399.zip | |
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h index a39c53c07..9006b2253 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -58,7 +58,7 @@ void nxagentWMDetect(void); #ifdef XlibAtom /* - * only provide these protoypes if the including file knows about Xlib + * only provide these prototypes if the including file knows about Xlib * types. This allows us including Atoms.h without having to use the * Xlib type magic of Agent.h */ |