From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 16 May 2010 20:50:58 +0000
Subject: svn merge -r588:HEAD ^/branches/released .

---
 xorg-server/hw/xwin/winconfig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/hw/xwin/winconfig.c')

diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index c3b9dcc35..afdf6926e 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -390,10 +390,10 @@ winConfigKeyboard (DeviceIntPtr pDevice)
                   (1000 / g_winInfo.keyboard.rate) < 1) 
             {
               ErrorF ("\"%s\" is not a valid AutoRepeat value", s);
-              xfree(s);
+              free(s);
               return FALSE;
             }
-          xfree(s);
+          free(s);
           winDebug ("AutoRepeat: %ld %ld\n", 
                   g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
         }
-- 
cgit v1.2.3