diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 01:07:02 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 01:07:02 +0100 |
| commit | 92d806399c69fda03275dcc23758498f9321434c (patch) | |
| tree | ccd0a621cc80b4853d6f7e262388b207db16dc4f /testscripts/run-nxproxy2nxproxy-over-sockets | |
| parent | 751760421f6644c22e30baa6ee8e791642d6a04d (diff) | |
| parent | 0371276fb4030261878dd6cfced9abd7bcd6137f (diff) | |
| download | nx-libs-92d806399c69fda03275dcc23758498f9321434c.tar.gz nx-libs-92d806399c69fda03275dcc23758498f9321434c.tar.bz2 nx-libs-92d806399c69fda03275dcc23758498f9321434c.zip | |
Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x
Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660
Fixes: ArcticaProject/nx-libs#653
Fixes: ArcticaProject/nx-libs#639
Diffstat (limited to 'testscripts/run-nxproxy2nxproxy-over-sockets')
0 files changed, 0 insertions, 0 deletions