[X2Go-Commits] [nx-libs] 16/30: Merge branch 'uli42-pr/update_mi' 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 3fffa5bd81650ffae994df1158d17c9e1d9410d2
Merge: eaae961 7368b45
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 27 02:56:01 2018 +0100

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

 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c  |  5 ++---
 nx-X11/programs/Xserver/mi/mi.h                  | 10 ---------
 nx-X11/programs/Xserver/mi/micmap.c              |  4 +++-
 nx-X11/programs/Xserver/mi/miinitext.c           | 15 +++++++-------
 nx-X11/programs/Xserver/mi/mipointer.c           |  2 +-
 nx-X11/programs/Xserver/mi/miscrinit.c           | 26 ------------------------
 nx-X11/programs/Xserver/mi/misprite.c            | 22 ++++++++++----------
 nx-X11/programs/Xserver/mi/mivaltree.c           | 24 +++++++++++-----------
 nx-X11/programs/Xserver/mi/miwideline.c          |  9 +++++---
 nx-X11/programs/Xserver/miext/damage/Imakefile   |  2 +-
 nx-X11/programs/Xserver/miext/damage/damagestr.h |  1 +
 11 files changed, 45 insertions(+), 75 deletions(-)

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