[X2Go-Commits] [nx-libs] 23/23: Merge branch 'uli42-pr/update_fb' 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 a110b0c456916f78b4653c39db5196acadfc0681
Merge: b1c42dc f7207bc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 5 14:07:27 2018 +0100

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

 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/render/picture.h |  10 +++
 5 files changed, 109 insertions(+), 46 deletions(-)

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