xserver: Branch 'server-1.2-branch'

[Alan Hourihane]

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

New commits:
diff-tree 8049eeea994ad88273b3e62199237f41b22b48df (from f604d0b69a61d3c4d9b7c815686f1947f23d1a5c)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Tue Dec 12 11:28:24 2006 +0000

    Fix bad commit
    (cherry picked from 81281cb298a5825bc7a2e692375a86199293bbbe commit)

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