xserver: Branch 'master' - 14 commits

[Colin Harrison]

Hi,

Peter Hutterer wrote:
>  enterleave.c: In function 'DeviceFocusOutEvents':
> enterleave.c:618:9: error: implicit declaration of function
> 'DeviceFocusEvent' [-Werror=implicit-function-declaration]
> enterleave.c:618:9: warning: nested extern declaration of
'DeviceFocusEvent'
> [-Wnested-externs]

Trivial to fix with...
--- ./dix/save_enterleave.c     2012-03-26 18:46:59.432816397 +0100
+++ ./dix/enterleave.c  2012-05-14 20:51:43.343698453 +0100
@@ -35,6 +35,7 @@
 #include "scrnintstr.h"
 #include "exglobals.h"
 #include "enterleave.h"
+#include "exevents.h"

 /**
  * @file

Thanks,
Colin Harrison