[X2Go-Commits] [nx-libs] 01/01: Merge branch '3.6.x' into 3.6.x-rpm-debug

[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-rpm-debug
in repository nx-libs.

commit 95ac2a8fd32b8eef9de020afe08ff3a22c204d42
Merge: 1ea2a6f a110b0c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 7 20:09:00 2018 +0100

    Merge branch '3.6.x' into 3.6.x-rpm-debug

 debian/rules                                    |  36 ++++----
 nx-X11/programs/Xserver/fb/fbblt.c              |  24 ++++++
 nx-X11/programs/Xserver/fb/fbcompose.c          | 110 +++++++++++++++---------
 nx-X11/programs/Xserver/fb/fbgc.c               |   9 +-
 nx-X11/programs/Xserver/fb/fbpict.h             |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Client.c     |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Composite.c  |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Dialog.c     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c     |   7 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c   |  10 +--
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c |  13 +--
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c      |  27 ++++--
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c     |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |  20 ++---
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c   |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c     |  12 +--
 nx-X11/programs/Xserver/hw/nxagent/Split.c      |  14 +--
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |   6 +-
 nx-X11/programs/Xserver/render/picture.h        |  10 +++
 20 files changed, 200 insertions(+), 118 deletions(-)

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