hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-15 00:13:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into input-api

Browse source 
Conflicts:
	config/udev.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86Module.h
	hw/xfree86/common/xf86Xinput.h
	hw/xfree86/os-support/linux/lnx_init.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2010-10-15 13:46:59 +10:00
commit eaf0b6a4d8
254 changed files with 15168 additions and 22174 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/xfree86/common/xf86Xinput.h
View file

@ -74,7 +74,6 @@ typedef struct _InputDriverRec {
struct _InputInfoRec *pInfo,
int flags);
pointer module;
int refCount;
char ** default_options;
} InputDriverRec, *InputDriverPtr;