diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-10-09 22:10:57 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-10-09 22:10:57 +0200 |
commit | b67be23b15a58c4f287a0d54534ec557772f8524 (patch) | |
tree | ab6c175dc49d029684d1523982fdc64f58c4fb9d /Makefile | |
parent | 27c14b4eb3e42e1da2a3954393507b1ea4614462 (diff) | |
parent | 418db3b5ce28bcc5b1d00d7444041ea2d6592706 (diff) | |
download | nx-libs-b67be23b15a58c4f287a0d54534ec557772f8524.tar.gz nx-libs-b67be23b15a58c4f287a0d54534ec557772f8524.tar.bz2 nx-libs-b67be23b15a58c4f287a0d54534ec557772f8524.zip |
Merge branch 'sunweaver-pr/nxcomp-tokensize-in-vpn-tunnels' into 3.6.x
Attributes GH PR #521: https://github.com/ArcticaProject/nx-libs/pull/521
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions