diff options
| author | marha <marha@users.sourceforge.net> | 2014-11-29 16:13:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-11-29 16:13:30 +0100 |
| commit | 7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c (patch) | |
| tree | e5b941fdff86328a065c46582ba53e0cc73c8576 /xorg-server/exa/exa_render.c | |
| parent | 0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6 (diff) | |
| parent | a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9 (diff) | |
| download | vcxsrv-7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c.tar.gz vcxsrv-7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c.tar.bz2 vcxsrv-7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/glx/glshim.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winmultiwindowshape.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winprefslex.l
xorg-server/hw/xwin/winshadddnl.c
xorg-server/hw/xwin/winshadgdi.c
xorg-server/hw/xwin/winwndproc.c
xorg-server/mi/miarc.c
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/exa/exa_render.c')
| -rw-r--r-- | xorg-server/exa/exa_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c index c4edf407e..e3e552697 100644 --- a/xorg-server/exa/exa_render.c +++ b/xorg-server/exa/exa_render.c @@ -559,7 +559,7 @@ exaCompositeRects(CARD8 op, box.y2 = y2 < MAXSHORT ? y2 : MAXSHORT; /* The pixmap migration code relies on pendingDamage indicating - * the bounds of the current rendering, so we need to force + * the bounds of the current rendering, so we need to force * the actual damage into that region before we do anything, and * (see use of DamagePendingRegion in exaCopyDirty) */ @@ -613,7 +613,7 @@ exaCompositeRects(CARD8 op, /************************************************************/ if (!pMask) { - /* Now we have to flush the damage out from pendingDamage => damage + /* Now we have to flush the damage out from pendingDamage => damage * Calling DamageRegionProcessPending has that effect. */ |