diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
| commit | 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d (patch) | |
| tree | 092efcfc39e3e293baaf04c4c84027ee453d3e13 /XTrap/xtrapddmi.c | |
| parent | eace88989c3b65d5c20e9f37ea9b23c7c8e19335 (diff) | |
| parent | ae869fc7669764729e13fdd70149ed636753f2a3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
Diffstat (limited to 'XTrap/xtrapddmi.c')
| -rw-r--r-- | XTrap/xtrapddmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index ec094ecf4..8ce99543d 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -52,7 +52,7 @@ SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include <X11/X.h> /* From library include environment */ -#include "input.h" /* From server include env. (must be before Xlib.h!) */ +#include "inputstr.h" /* From server include env. (must be before Xlib.h!) */ #ifdef PC # include "scrintst.h" /* Screen struct */ # include "extnsist.h" |