xserver: Branch 'master'

[Julien Cristau]

 hw/dmx/examples/xinput.c |    2 +-
 hw/dmx/examples/xled.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 911f0c147699d3b8d97491be2ef6d2e4a6682a0b
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Mar 7 23:24:06 2008 +0100

    Programs in hw/dmx/examples/ want client-side xkb headers.

diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c
index b6753e4..74353a9 100644
--- a/hw/dmx/examples/xinput.c
+++ b/hw/dmx/examples/xinput.c
@@ -38,7 +38,7 @@
 #include <X11/XKBlib.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XKB.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/dmxext.h>
 #include <sys/time.h>
 
diff --git a/hw/dmx/examples/xled.c b/hw/dmx/examples/xled.c
index 322dda2..270f805 100644
--- a/hw/dmx/examples/xled.c
+++ b/hw/dmx/examples/xled.c
@@ -37,7 +37,7 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKB.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <sys/time.h>
 
 int main(int argc, char **argv)