From 8d709f0280b458515b32c2b87938749428e5c149 Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@agamemnon.b5>
Date: Sun, 10 Sep 2006 15:48:35 -0400
Subject: [PATCH 1/3] Remove a merge artifact so that we can compile.

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8aa6a3424..047857af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1504,7 +1504,6 @@ if test "$KDRIVE" = yes; then
     fi
     
     # tslib...
-<<<<<<< HEAD/configure.ac
     AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
     if test "x$TSLIB" = xauto && test "x$HAVE_TSLIB" = xyes; then
         TSLIB=yes

From 0a3740a0000191e3039fe183ae51b938d0548340 Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@agamemnon.b5>
Date: Sun, 10 Sep 2006 15:49:25 -0400
Subject: [PATCH 2/3] Typo correction, 'i' is not a '1', so no longer crash on
 some Xi requests.

---
 Xi/selectev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/selectev.c b/Xi/selectev.c
index 1f6713ad4..7d3ef9d48 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -178,7 +178,7 @@ ProcXSelectExtensionEvent(register ClientPtr client)
 	return Success;
     }
 
-    if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[i],
+    if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[1],
                                 &stuff->count) != Success) {
        SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
                          BadAlloc);

From 58933757862c458e2da39bd464e50d9c0e41b313 Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@agamemnon.b5>
Date: Sun, 10 Sep 2006 15:50:51 -0400
Subject: [PATCH 3/3] Warning fix, and a syntax fix in a #if 0 section of code.

---
 dix/events.c   | 1 +
 xkb/xkbUtils.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index c2c03950d..34ee9fb15 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -135,6 +135,7 @@ of the copyright holder.
 #include <X11/extensions/XKBproto.h>
 #include <X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
+extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
 #endif
 
 #ifdef XCSECURITY
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 0fde727ea..cbf46d860 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -242,7 +242,7 @@ XkbMapChangesPtr	mc;
 	    xkb->min_key_code= first;
 	    /* 1/12/95 (ef) -- XXX! should zero out the new maps */
 	    changes->map.changed|= XkbKeycodesMask;
-generate a NewKeyboard notify here?
+/* generate a NewKeyboard notify here? */
 	}
     }
 #endif