diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
commit | 3c322ffbb911b70415c47cb8ba1c3559241819f6 (patch) | |
tree | e6e1f345f4f8fd25f67b58a1abf80d14381489ce /nxcompshad/Poller.h | |
parent | c79f2d289004d419d8bb76cf8bf731980d40da5d (diff) | |
parent | 104a3e9e2dbafd31e7b1def3686d052a356fc74a (diff) | |
download | nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.gz nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.bz2 nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.zip |
Merge branch 'sunweaver-pr/security-acl-naming-change' into 3.6.x
Attributes GH PR #329: https://github.com/ArcticaProject/nx-libs/pull/329
Diffstat (limited to 'nxcompshad/Poller.h')
0 files changed, 0 insertions, 0 deletions