[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 1ea2a6f5a18d4c5a9629e172e1381b5bf5a84931
Merge: 6ec38c5 949b91c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jan 21 08:49:17 2018 +0100

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

 ChangeLog                                        | 1292 +++++++++++++++++++++-
 VERSION                                          |    2 +-
 debian/changelog                                 |    7 +
 nx-X11/programs/Xserver/hw/nxagent/Screen.c      |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |    2 +-
 nx-libs.spec                                     |    2 +-
 nxcomp/src/Loop.cpp                              |    2 +-
 nxproxy/man/nxproxy.1                            |    2 +-
 8 files changed, 1293 insertions(+), 18 deletions(-)

diff --cc nx-libs.spec
index 0843e28,748ca3d..aca5ec5
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@@ -9,10 -9,8 +9,10 @@@
  %global __global_cxxflags %{?__global_cxxflags} -mno-vsx
  %endif
  
 +%global optflags %{?optflags} -fno-inline-functions-called-once -fno-inline -fno-inline-small-functions -fno-inline-functions
 +
  Name:           nx-libs
- Version:        3.5.99.12
+ Version:        3.5.99.13
  Release:        0.0build1%{?dist}
  Summary:        NX X11 protocol compression libraries
  

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