From 32048c06dd107af1634aa0e9f301877679c87779 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:03:34 +0900 Subject: [PATCH] merge with master --- packaging/xorg-x11-drv-evdev-multitouch.spec | 2 +- src/evdevmultitouch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/xorg-x11-drv-evdev-multitouch.spec b/packaging/xorg-x11-drv-evdev-multitouch.spec index 5a99f83..e59313a 100644 --- a/packaging/xorg-x11-drv-evdev-multitouch.spec +++ b/packaging/xorg-x11-drv-evdev-multitouch.spec @@ -2,7 +2,7 @@ Name: xorg-x11-drv-evdev-multitouch Summary: X.Org evdev multitouch input driver. Version: 2.3.2 -Release: 2 +Release: 4 Group: TO_BE/FILLED_IN License: TO BE FILLED IN Source0: %{name}-%{version}.tar.gz diff --git a/src/evdevmultitouch.c b/src/evdevmultitouch.c index a43bcd3..0a63ada 100755 --- a/src/evdevmultitouch.c +++ b/src/evdevmultitouch.c @@ -203,7 +203,7 @@ static InputInfoPtr pCreatorInfo = NULL; /* All devices the evdevmultitouch driver has allocated and knows about. * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) * cannot be used by evdevmultitouch, leaving us with a space of 2 at the end. */ -static EvdevMultitouchPtr evdevmultitouch_devices[MAXDEVICES] = {NULL}; +static EvdevMultitouchPtr evdevmultitouch_devices[MAXDEVICES] = {NULL,}; static size_t EvdevMultitouchCountBits(unsigned long *array, size_t nlongs) { -- 2.7.4