[X2Go-Commits] [nx-libs] 21/40: Merge branch 'sunweaver-pr/DXPC-re-license-retroactively' into arctica-3.6.x

[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
in repository nx-libs.

commit beb08f96c9b04beb11c1ce930fdb7363d6423977
Merge: e364fde 1f44331
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue May 26 16:51:38 2015 +0200

    Merge branch 'sunweaver-pr/DXPC-re-license-retroactively' into arctica-3.6.x
    
    Attributes GH PR #31: https://github.com/ArcticaProject/nx-libs/pull/31

 doc/DXPC_re-licensed::debbug_784565.mbox  | 3769 +++++++++++++++++++++++++++++
 nxcomp/LICENSE                            |   59 +-
 nxcomp/Misc.cpp                           |    6 +-
 nxcomp/README.on-retroactive-DXPC-license |  269 ++
 4 files changed, 4097 insertions(+), 6 deletions(-)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git