xserver: Branch 'server-1.2-branch'

[Alan Hourihane]

 hw/xwin/InitOutput.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree f604d0b69a61d3c4d9b7c815686f1947f23d1a5c (from 1587946f875f75f5324b35d0fc3f79a6e375bf7d)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Dec 11 14:54:49 2006 +0000

    Fix Xming fails to use xkb bug
    bug #5049 (Colin Harrison)
    (cherry picked from 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c commit)

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index b64eee9..9964980 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -694,6 +694,7 @@ winFixupPaths (void)
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir)-1] = 0;
         XkbBaseDirectory = xkbbasedir;
+	XkbBinDirectory = xkbbasedir
     }
 #endif /* XKB */
 #endif /* RELOCATE_PROJECTROOT */