aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/window.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-03 13:53:39 +0200
committermarha <marha@users.sourceforge.net>2013-10-03 13:53:39 +0200
commit7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch)
tree4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /xorg-server/dix/window.c
parentc3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff)
parent5593a3d2f370e3e12a043110bf2e395c938980d6 (diff)
downloadvcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz
vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2
vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xkeyboard-config git update 3 Oct 2003 Conflicts: xorg-server/xkeyboard-config/symbols/level3 xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'xorg-server/dix/window.c')
0 files changed, 0 insertions, 0 deletions