xserver: Branch 'master'

[Adam Jackson]

 dix/window.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2dafa1bdafe583587431a5f6ebee6ec371c61a8d
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Thu Nov 2 21:27:59 2017 +0100

    dix/window: fix typos
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/dix/window.c b/dix/window.c
index ead4dc27f..8789a5ece 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -456,9 +456,9 @@ TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, void *data)
 
 /*****
  * WalkTree
- *   Walk the window tree, for SCREEN, preforming FUNC(pWin, data) on
+ *   Walk the window tree, for SCREEN, performing FUNC(pWin, data) on
  *   each window.  If FUNC returns WT_WALKCHILDREN, traverse the children,
- *   if it returns WT_DONTWALKCHILDREN, dont.  If it returns WT_STOPWALKING
+ *   if it returns WT_DONTWALKCHILDREN, don't.  If it returns WT_STOPWALKING,
  *   exit WalkTree.  Does depth-first traverse.
  *****/