diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-27 16:14:30 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-27 16:14:30 +0200 |
| commit | d7d2aeea4b23f6abb3c51796d18261f11e7bd0ab (patch) | |
| tree | bbaf11c9165845bce597f8feea55a0501ffd873a /nxcomp/Proxy.h | |
| parent | ac03b5172a00005897705dea0fc125c0309cc59c (diff) | |
| parent | 00405b278471b4b5aa65003eb7ae97ac17d56445 (diff) | |
| download | nx-libs-d7d2aeea4b23f6abb3c51796d18261f11e7bd0ab.tar.gz nx-libs-d7d2aeea4b23f6abb3c51796d18261f11e7bd0ab.tar.bz2 nx-libs-d7d2aeea4b23f6abb3c51796d18261f11e7bd0ab.zip | |
Merge branch 'uli42-pr/libX11-HEAD' into 3.6.x
Fixes ArcticaProject/nx-libs#400.
Attributes GH PR #414: https://github.com/ArcticaProject/nx-libs/pull/414
am into a topic branch.
Diffstat (limited to 'nxcomp/Proxy.h')
0 files changed, 0 insertions, 0 deletions