[X2Go-Commits] [nx-libs] 25/38: Merge branch 'uli42-pr/update_xfixes' 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 b40dec982d17b010cedc183ebdc4c75ca7de785f
Merge: 164263e 35d166b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 26 03:00:24 2018 +0100

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

 nx-X11/include/extensions/Imakefile                |   1 +
 nx-X11/include/extensions/shapeconst.h             |  55 ++++
 nx-X11/include/extensions/xfixesproto.h            |  79 +++++-
 nx-X11/include/extensions/xfixeswire.h             |  43 ++-
 .../programs/Xserver/include/protocol-versions.h   |   2 +-
 nx-X11/programs/Xserver/xfixes/cursor.c            | 304 ++++++++++++++++++++-
 nx-X11/programs/Xserver/xfixes/region.c            |  21 +-
 nx-X11/programs/Xserver/xfixes/saveset.c           |   8 +-
 nx-X11/programs/Xserver/xfixes/select.c            |  13 +-
 nx-X11/programs/Xserver/xfixes/xfixes.c            |  33 ++-
 nx-X11/programs/Xserver/xfixes/xfixes.h            |   2 -
 nx-X11/programs/Xserver/xfixes/xfixesint.h         |  43 ++-
 12 files changed, 572 insertions(+), 32 deletions(-)

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