aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/merge.py
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-04-15 00:03:51 +0200
committermarha <marha@users.sourceforge.net>2014-04-15 00:03:51 +0200
commit95733096c20d28f239759fc28c6284f622003f09 (patch)
tree7808ffa1a18b4b9dd30a737f12ba340a7f597691 /xorg-server/xkeyboard-config/rules/merge.py
parent86820a9ebc2d86a26511f3f2ec162e4499c1539b (diff)
parentc7a23c91d421c37cc2893f6f52a1dceb0c3e9f85 (diff)
downloadvcxsrv-95733096c20d28f239759fc28c6284f622003f09.tar.gz
vcxsrv-95733096c20d28f239759fc28c6284f622003f09.tar.bz2
vcxsrv-95733096c20d28f239759fc28c6284f622003f09.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/merge.py')
0 files changed, 0 insertions, 0 deletions