xserver: Branch 'master'

[Alan Hourihane]

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

New commits:
diff-tree 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c (from 27d4b84f268ac21601f7f52a7e257f70753396b3)
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)

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 */