Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard
2010-07-01 23:46:53 -04:00
6 changed files with 68 additions and 75 deletions

View File

@@ -924,6 +924,15 @@ extern int XkbGetEffectiveGroup(
XkbStatePtr /* xkbstate */,
CARD8 /* keycode */);
extern void XkbMergeLockedPtrBtns(
DeviceIntPtr /* master */);
extern void XkbFakeDeviceButton(
DeviceIntPtr /* dev */,
int /* press */,
int /* button */);
#include "xkbfile.h"
#include "xkbrules.h"