xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/common/xf86Xinput.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ce19b4477057a724b548e342d4c6da2b6721824
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Thu Oct 30 16:02:13 2008 +1030

    xfree86: fix xf86ScaleAxis once again.
    
    Maybe one day I stop doing stupid patches like
    a3a7c12fcf8e4ac1418f9ea53f76091f309a721b.
    
    So, if X < low, reset to low, and _not_ to high.
    If X > high, reset to high, and _not_ to low.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f99bfb7..f028a25 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -935,9 +935,9 @@ xf86ScaleAxis(int	Cx,
     }
     
     if (X > Sxhigh)
-	X = Sxlow;
-    if (X < Sxlow)
 	X = Sxhigh;
+    if (X < Sxlow)
+	X = Sxlow;
     
     return (X);
 }