[X2Go-Commits] [nx-libs] 02/02: 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 8cbea65a14e6d30288bbbffac540100e432033de
Merge: a85711a 28c14ac
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Mar 17 01:57:54 2018 +0100

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

 ChangeLog                                        | 78 ++++++++++++++++++++++--
 VERSION                                          |  2 +-
 debian/changelog                                 |  7 +++
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |  2 +-
 nx-libs.spec                                     |  2 +-
 nxproxy/man/nxproxy.1                            |  2 +-
 6 files changed, 84 insertions(+), 9 deletions(-)

diff --cc nx-libs.spec
index b0c8b6f,3f4e978..d31c0af
--- 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.15
+ Version:        3.5.99.16
  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