nx-libs.git - upstream (branch) created: nxproxy/3.5.0-1-78-g4e52686 - x2go-commits

7 Jan 2012

      The branch, upstream has been created
        at  4e52686f405751f11a9bbec8a51a3c36958045d9 (commit)

- Log -----------------------------------------------------------------
commit 4e52686f405751f11a9bbec8a51a3c36958045d9
Merge: 80c706f99e149c4795934cd4e388c2add2d63dce caf1bc41f931009e24c28a18a7311da03b68961c
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:11:20 2012 +0100

    Merge branch 'nxauth' into upstream

commit 80c706f99e149c4795934cd4e388c2add2d63dce
Merge: fbff5942a12932cc7a529798077311209265b2aa c29053f82cbea5f2704d99c4d5e8afe0329e5cbe
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:11:15 2012 +0100

    Merge branch 'nxagent' into upstream

commit fbff5942a12932cc7a529798077311209265b2aa
Merge: f4c72b9419504ae272edce3d5fe7bf5a5aad6af1 15cee47a496ef891923949ade073cf4ffabb9c73
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:10:29 2012 +0100

    Merge branch 'nx-X11' into upstream

commit f4c72b9419504ae272edce3d5fe7bf5a5aad6af1
Merge: edb7aa2d180ea37b7f7893575a0b02643b527f82 bf85c6e696693ef5a277c0334c01493dedf4fadd
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:10:18 2012 +0100

    Merge branch 'nxcompshad' into upstream

commit edb7aa2d180ea37b7f7893575a0b02643b527f82
Merge: a54e2279e6a7f776c1a20c46dad589c9c2602606 88dace9a99687840f3fb341f0316cd94399cae9e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:10:09 2012 +0100

    Merge branch 'nxcompext' into upstream

commit a54e2279e6a7f776c1a20c46dad589c9c2602606
Merge: 232dfc41d41390bfffa75ec2ed065c109fa03a0e 6dc46faed83596d64bb86d9a4b35543f5122e1dd
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jan 7 08:10:01 2012 +0100

    Merge branch 'nxproxy' into upstream

-----------------------------------------------------------------------

hooks/post-receive
-- 
nx-libs.git (NX libraries)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).