xserver: Branch 'glucose-2' - 3 commits

[Daniel Stone]

On Wed, Sep 12, 2007 at 11:36:25AM -0700, Jose Fonseca wrote:
> diff-tree a2f96d3135d71828bf1dfc8407b456decb444892 (from be9fa811821c77874d83637dc96310015f394b2d)
> Author: José Fonseca <jrfonseca at tungstengraphics.com>
> Date:   Wed Sep 12 19:24:07 2007 +0100
> 
>     Update for input interface changes.
> 
> diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
> index 92974f0..1cf2098 100644
> --- a/hw/xgl/glx/xglx.c
> +++ b/hw/xgl/glx/xglx.c
> @@ -50,7 +50,7 @@
>  
>  #ifdef XKB
>  #include <X11/extensions/XKB.h>
> -#include <xkbsrv.h>
> +#include <X11/extensions/XKBsrv.h>

This is exactly the reverse: XKBsrv.h moved from kbproto to xserver, and
got renamed to xkbsrv.h in the process.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20070912/097e17f9/attachment.pgp>