[X2Go-Commits] [nx-libs] 27/108: Merge branch 'sunweaver-pr/drop-nomachine-icon' into 3.6.x

git-admin at x2go.org git-admin at x2go.org
Fri Nov 9 20:35:36 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit d3bbca712dc7109539f9af985fe2d30a7c9b0419
Merge: 930bd28 31ac5a1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 24 23:54:13 2018 +0200

    Merge branch 'sunweaver-pr/drop-nomachine-icon' into 3.6.x
    
     Attributes GH PR #687: https://github.com/ArcticaProject/nx-libs/pull/687
    
     Reviewed by Ulrich Sibiller <uli42 at gmx.de> -- Fri, 24 Aug 2018 21:47:34 +0000 (UTC)

 doc/nxagent/x11.svg                              |  27 ++
 nx-X11/programs/Xserver/hw/nxagent/Args.c        |  22 +-
 nx-X11/programs/Xserver/hw/nxagent/Icons.h       |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c        |   9 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.h        |   1 +
 nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm   | 422 ++++++++++++++++++++---
 nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm |   1 +
 nx-X11/programs/Xserver/hw/nxagent/x11.svg       |  27 ++
 nx-X11/programs/Xserver/hw/nxagent/x2go.xpm      | 163 ---------
 nx-X11/programs/Xserver/hw/nxagent/x2goagent.xpm | 165 +++++++++
 10 files changed, 616 insertions(+), 223 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list