diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
| commit | e8777a91f37d828b9df839bf3d9cf2f954bdddb0 (patch) | |
| tree | 07dbc5bb75954b39eb84809907f58025b3419773 /xkb/ddxFakeMtn.c | |
| parent | a12054757d21edacc1c24c3077b9214726652829 (diff) | |
| parent | 96ce17aa94413c4b8bcb61cae71167050130a307 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
Diffstat (limited to 'xkb/ddxFakeMtn.c')
| -rw-r--r-- | xkb/ddxFakeMtn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index d15c5c193..446764c86 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> #include <X11/extensions/XI.h> #ifdef PANORAMIX |