aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/xkbstr.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-19 11:34:57 +0200
committermarha <marha@users.sourceforge.net>2014-10-19 11:34:57 +0200
commit8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch)
treed1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /xorg-server/include/xkbstr.h
parent9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff)
parenta14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff)
downloadvcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz
vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2
vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip
Merge remote-tracking branch 'origin/released'
Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
Diffstat (limited to 'xorg-server/include/xkbstr.h')
0 files changed, 0 insertions, 0 deletions