aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/resource.h
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-26 01:09:05 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 01:09:05 +0100
commit164263e1a12fc8a3a496739799cb60d547857f0a (patch)
treef94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nx-X11/programs/Xserver/include/resource.h
parent05152b788ab184f45df1f64182791c88a09dc6f9 (diff)
parent8d00456ad3e7b7a49d8fadb269334589e3704758 (diff)
downloadnx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.gz
nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.bz2
nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.zip
Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658 Fixes: ArcticaProject/nx-libs#657
Diffstat (limited to 'nx-X11/programs/Xserver/include/resource.h')
0 files changed, 0 insertions, 0 deletions