[X2Go-Commits] [nx-libs] 24/25: Merge branch 'arctica-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 d699cf082a8993c0f4ca7e7adbb51790de49d857
Merge: 8cbea65 01dbfde
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Apr 30 22:33:55 2018 +0200

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

 Makefile        |  44 +++++++++----------
 debian/rules    |  67 +---------------------------
 nx-X11/Makefile | 133 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 88 insertions(+), 156 deletions(-)

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