[X2Go-Commits] [nx-libs] 44/108: Merge branch 'uli42-pr/libX11_1.6.6' 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 master
in repository nx-libs.

commit 2eb4a65ebd9aa04bd663fb9a7f0680fd2c56e990
Merge: 3dc4595 701e702
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 23 12:14:51 2018 +0200

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

 nx-X11/lib/include/X11/Xlibint.h          | 125 +++++++++++++++++++++++++++++-
 nx-X11/lib/modules/im/ximcp/imCallbk.c    |   6 +-
 nx-X11/lib/modules/im/ximcp/imDefIc.c     |  82 +++++++++++++-------
 nx-X11/lib/modules/im/ximcp/imInsClbk.c   |   2 +-
 nx-X11/lib/modules/im/ximcp/imLcIm.c      |   8 +-
 nx-X11/lib/modules/im/ximcp/imLcLkup.c    |   6 +-
 nx-X11/lib/modules/om/generic/omGeneric.c |  32 +++-----
 nx-X11/lib/src/DisName.c                  |   2 +-
 nx-X11/lib/src/FSWrap.c                   |   2 +-
 nx-X11/lib/src/FontNames.c                |  16 +---
 nx-X11/lib/src/GetFPath.c                 |  11 ++-
 nx-X11/lib/src/GetImage.c                 |  16 ++--
 nx-X11/lib/src/LiHosts.c                  |  19 +++--
 nx-X11/lib/src/ListExt.c                  |  19 ++---
 nx-X11/lib/src/SetHints.c                 |   4 +-
 nx-X11/lib/src/StColor.c                  |   1 +
 nx-X11/lib/src/StColors.c                 |   1 +
 nx-X11/lib/src/StrKeysym.c                |  10 +--
 nx-X11/lib/src/XlibInt.c                  |  86 ++++++++++----------
 nx-X11/lib/src/xcms/LRGB.c                |   3 +
 nx-X11/lib/src/xcms/cmsColNm.c            |   2 +-
 nx-X11/lib/src/xcms/cmsLkCol.c            |   3 +-
 nx-X11/lib/src/xcms/cmsProp.c             |   1 +
 nx-X11/lib/src/xkb/XKBAlloc.c             |   8 +-
 nx-X11/lib/src/xlibi18n/lcCT.c            |  10 +--
 nx-X11/lib/src/xlibi18n/lcDB.c            |   2 +-
 nx-X11/lib/src/xlibi18n/lcGeneric.c       |   1 +
 nx-X11/lib/src/xlibi18n/lcPublic.c        |   1 +
 28 files changed, 313 insertions(+), 166 deletions(-)

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