Keith, Please pull from the for-keith branch from my fdo repo. Patches below are the last two xkb cleanup fixes, another simple xkb bugfix and the crash fix for the wacom driver's internal hotplugging.
Cheers, Peter The following changes since commit 52456c602c3cdd7d5eac677889a18fad37dfb7ae: Jeremy Huddleston (1): XQuartz: Attatch a stub display when CoreGraphics reports no displays. are available in the git repository at: git://people.freedesktop.org/~whot/xserver.git for-keith Horst Wente (1): xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743) Oldřich Jedlička (2): Fix typo in updateSlaveDeviceCoords Allow driver to call DeleteInputDeviceRequest during UnInit Peter Hutterer (2): xkb: Add XKM file format description. xkb: sed True -> TRUE and False -> FALSE dix/devices.c | 44 +++- dix/getevents.c | 2 +- include/xkbsrv.h | 5 - xkb/XKBAlloc.c | 12 +- xkb/XKBGAlloc.c | 32 ++-- xkb/XKBMisc.c | 48 ++-- xkb/XKM_file_format.txt | 684 +++++++++++++++++++++++++++++++++++++++++++++++ xkb/ddxBeep.c | 2 +- xkb/ddxList.c | 6 +- xkb/ddxLoad.c | 18 +- xkb/maprules.c | 86 +++--- xkb/xkb.c | 94 ++++---- xkb/xkbAccessX.c | 30 +- xkb/xkbActions.c | 38 ++-- xkb/xkbEvents.c | 6 +- xkb/xkbInit.c | 30 +- xkb/xkbLEDs.c | 32 ++-- xkb/xkbUtils.c | 20 +- xkb/xkbfmisc.c | 38 ++-- xkb/xkbout.c | 68 +++--- xkb/xkbtext.c | 42 ++-- xkb/xkmread.c | 28 ++- 22 files changed, 1036 insertions(+), 329 deletions(-) create mode 100644 xkb/XKM_file_format.txt _______________________________________________ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel