diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:09:24 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:09:24 +0200 |
commit | 854f3fa49351ec72da432f195806162fcf5e5ddc (patch) | |
tree | 2366136004c46641fa72b8a717663c7ac08ac440 /nx-X11/programs/Xserver/include/dixfont.h | |
parent | e0edae04db6dc189512b3a1eda7fe4516af56512 (diff) | |
parent | 5a22f2ec1fc5f40257bb61939f9cad4187e00ab8 (diff) | |
download | nx-libs-854f3fa49351ec72da432f195806162fcf5e5ddc.tar.gz nx-libs-854f3fa49351ec72da432f195806162fcf5e5ddc.tar.bz2 nx-libs-854f3fa49351ec72da432f195806162fcf5e5ddc.zip |
Merge branch 'sunweaver-pr/proxy-to-proxy-over-unix-socket' into 3.6.x
Attributes GH PR #142: https://github.com/ArcticaProject/nx-libs/pull/142
Reviewed by: Salvador Fandino <sfandino@yahoo.com> -- Mon, 04 Jul 2016 16:31:00 +0200
Diffstat (limited to 'nx-X11/programs/Xserver/include/dixfont.h')
0 files changed, 0 insertions, 0 deletions