Merge branch 'uli42-pr/decouple-xserver' into 3.6.x

Attributes GH PR #220: https://github.com/ArcticaProject/nx-libs/issues/220 Fixes ArcticaProject/nx-libs#219. into a topic branch.

Merge branch 'uli42-pr/decouple-xserver' into 3.6.x
6dce607b · Mike Gabriel · f55852c2 · b0622729 · 6dce607b
Unverified Commit 6dce607b authored Oct 08, 2016 by Mike Gabriel
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

xkbfile.h nx-X11/programs/Xserver/include/xkbfile.h +0 -0

No files found.
--- a/nx-X11/programs/Xserver/include/xkbfile.h
+++ b/nx-X11/programs/Xserver/include/xkbfile.h