xserver: Branch 'master' - 2 commits

[Matthieu Herrb]

 Xext/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree bf5948518763b5e21eff806a0a9abc5f7757fa10 (from parents)
Merge: 4062db4020c671fc0921a3a4e7fe5d8dc1be2e1d 735da3dcd09f59c40f68eca8c9a91c2e826cd1b9
Author: Matthieu Herrb <matthieu at bluenote.herrb.com>
Date:   Tue Sep 4 22:40:31 2007 +0200

    Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver

diff-tree 4062db4020c671fc0921a3a4e7fe5d8dc1be2e1d (from 529acb175440969af9d7fa38aab8d7dea0dc2661)
Author: Matthieu Herrb <matthieu at bluenote.herrb.com>
Date:   Tue Sep 4 22:39:14 2007 +0200

    typo in comment

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index d0d23b7..946c118 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -87,7 +87,7 @@ endif
 XCALIBRATE_SRCS = xcalibrate.c
 if XCALIBRATE
 BUILTIN_SRCS += $(XCALIBRATE_SRCS)
-# XCalibrare needs tslib
+# XCalibrate needs tslib
 endif
 
 # X EVent Interception Extension: allows accessibility helpers & composite