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

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 241f6e10df21307aa68807f600518eaf699782ac Merge: d0d233f 1086c4a Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jan 9 01:09:44 2018 +0100 Merge branch '3.6.x' into 3.6.x-rpm-debug nxcomp/configure.ac | 17 +++++++++++++++ nxcomp/src/Timestamp.cpp | 55 +++++++++++++++++++++++++++++++++--------------- nxcomp/src/Timestamp.h | 16 +++++++++----- 3 files changed, 66 insertions(+), 22 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git