[X2Go-Commits] [nx-libs] 06/30: Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x

[git-admin at x2go.org]

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

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

commit 92d806399c69fda03275dcc23758498f9321434c
Merge: 7517604 0371276
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 27 01:07:02 2018 +0100

    Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x
    
    Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660
    
    Fixes: ArcticaProject/nx-libs#653
    Fixes: ArcticaProject/nx-libs#639

 nx-X11/programs/Xserver/hw/nxagent/Args.c        | 32 ++++++++++++++------
 nx-X11/programs/Xserver/hw/nxagent/Args.h        |  2 ++
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c       |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Binder.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Client.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Composite.c   |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Cursor.c      |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Dialog.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Display.c     | 38 ++++++++++++------------
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c    |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Error.c       |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Events.c      | 18 +++++------
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c  |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Font.c        |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/GC.c          |  6 ++--
 nx-X11/programs/Xserver/hw/nxagent/Image.c       |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Init.c        | 21 ++++++-------
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c    |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Options.c     |  8 ++---
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c      | 10 +++----
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c   |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Render.c      |  6 ++--
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c    |  8 ++---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c      |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/Split.c       | 10 +++----
 nx-X11/programs/Xserver/hw/nxagent/Visual.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c      |  6 ++--
 nx-X11/programs/Xserver/hw/nxagent/compext/Z.c   |  4 +--
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |  3 ++
 nx-X11/programs/Xserver/os/utils.c               |  5 ++++
 31 files changed, 124 insertions(+), 103 deletions(-)

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