[X2Go-Commits] [nx-libs] 30/219: Merge branch 'uli42-pr/small_fixes' 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 22649369085dfaa351003ba76b7838160089f7cc
Merge: f6177d2ad fac36b24f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 11 09:41:15 2019 +0200

    Merge branch 'uli42-pr/small_fixes' into 3.6.x
    
    Attributes GH PR #797: https://github.com/ArcticaProject/nx-libs/pull/797

 doc/nxagent/README.keystrokes                   |   36 +-
 etc/keystrokes.cfg                              |    1 -
 nx-X11/config/cf/gnu.cf                         |    2 +-
 nx-X11/config/cf/linux.cf                       |   32 +-
 nx-X11/include/extensions/Imakefile             |    2 +-
 nx-X11/include/extensions/xtestext1.h           |  325 -----
 nx-X11/programs/Xserver/Imakefile               |    2 +-
 nx-X11/programs/Xserver/Xext/Imakefile          |    6 +-
 nx-X11/programs/Xserver/Xext/xtest1dd.c         | 1612 -----------------------
 nx-X11/programs/Xserver/Xext/xtest1dd.h         |  126 --
 nx-X11/programs/Xserver/Xext/xtest1di.c         |  915 -------------
 nx-X11/programs/Xserver/damageext/Imakefile     |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile    |    2 -
 nx-X11/programs/Xserver/hw/nxagent/Init.c       |   14 +-
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c   |   43 +-
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c  |    2 -
 nx-X11/programs/Xserver/hw/nxagent/Millis.c     |   13 -
 nx-X11/programs/Xserver/hw/nxagent/Millis.h     |    2 -
 nx-X11/programs/Xserver/hw/nxagent/NXdamage.c   |   20 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c |   37 +-
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c   |    2 -
 nx-X11/programs/Xserver/hw/nxagent/Options.h    |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/TestExt.c    |   91 --
 nx-X11/programs/Xserver/mi/miinitext.c          |    6 -
 nx-X11/programs/Xserver/os/WaitFor.c            |   20 +-
 nx-X11/programs/Xserver/xkb/ddxLoad.c           |    2 +-
 nxdialog/bin/nxdialog                           |    8 +-
 28 files changed, 120 insertions(+), 3209 deletions(-)

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