diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
commit | 59a0620f68e9377001f23f5f491a8b02b520d685 (patch) | |
tree | 977e12e055ffb34eb671eaa428afd22633cf6d48 /nx-X11/programs/Xserver/hw/nxagent/Icons.h | |
parent | 6208dade860c6429791a5897136506adfd505e9d (diff) | |
parent | fcc1b57fb980b821138301a9585b91d10bfd0901 (diff) | |
download | nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.gz nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.bz2 nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.zip |
Merge branch 'uli42-pr/various7' into 3.6.x
Attributes GH PR #1007: https://github.com/ArcticaProject/nx-libs/pull/1007
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Icons.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Icons.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/nx-X11/programs/Xserver/hw/nxagent/Icons.h index a8a155cec..30457402b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h @@ -32,6 +32,8 @@ #define NXAGENT_ICON_NAME "nxagent.xpm" +#ifdef X2GO #define X2GOAGENT_ICON_NAME "x2goagent.xpm" +#endif #endif /* __Icons_H__ */ |