aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/xkbsrv.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-01 06:37:06 +0000
committermarha <marha@users.sourceforge.net>2010-07-01 06:37:06 +0000
commit87559ccfc67a98a75fa8068066871c35caa88e30 (patch)
tree2bf313d2ae1adb6840cff8e62ccce5f984af142a /xorg-server/include/xkbsrv.h
parent644d0b3793014483679c9ae0d45a972484c10cb9 (diff)
downloadvcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.gz
vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.bz2
vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.zip
git update 1/7/2010
Diffstat (limited to 'xorg-server/include/xkbsrv.h')
-rw-r--r--xorg-server/include/xkbsrv.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index 30b4f9f8e..bd342a351 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -924,6 +924,9 @@ extern int XkbGetEffectiveGroup(
XkbStatePtr /* xkbstate */,
CARD8 /* keycode */);
+extern void XkbMergeLockedPtrBtns(
+ DeviceIntPtr /* master */);
+
#include "xkbfile.h"
#include "xkbrules.h"