diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
commit | 015d728bcde5b16a72a976579755421e3023626b (patch) | |
tree | a77516504f14c8b20f844727f1cb2d4dcb87e757 /randr/rrpointer.c | |
parent | 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070 (diff) | |
parent | b167583fe234a536aa6187e17f21da85be4f0b7f (diff) |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
Diffstat (limited to 'randr/rrpointer.c')
-rw-r--r-- | randr/rrpointer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/randr/rrpointer.c b/randr/rrpointer.c index bf9031543..fec5d45bf 100644 --- a/randr/rrpointer.c +++ b/randr/rrpointer.c @@ -104,7 +104,7 @@ void RRPointerMoved (ScreenPtr pScreen, int x, int y) { rrScrPriv (pScreen); - RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;; + RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc; int c; /* Check last known CRTC */ |