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 c910bf7cd3c5a7ec079fee08234f51dea0deb576 Merge: 65deb86 203d971 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 17 09:28:03 2015 +0100 Merge pull request #3 from sunweaver/feature/nxagent-version-v2 Make nxagent aware of its NX'ish version string (and number). Makefile | 19 ++++++++++++++ nx-X11/config/cf/Imakefile | 3 ++- nx-X11/config/cf/nxversion.def.in | 4 +++ nx-X11/config/cf/xorg.cf | 26 +++++++++++++++++++- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 7 +++++- nx-X11/programs/Xserver/hw/nxagent/Init.c | 5 ++-- nx-X11/programs/Xserver/hw/nxagent/VERSION | 1 - version.sh | 34 ++++++++++++++++++++++++++ 8 files changed, 93 insertions(+), 6 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git