hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-31 02:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into exa-damagetrack

Browse source 
Conflicts:

	exa/exa_accel.c
	exa/exa_migration.c
This commit is contained in:
Michel Dänzer 2006-12-19 16:29:26 +01:00
commit 4334860e69
1711 changed files with 43709 additions and 69658 deletions
Download patch file Download diff file Expand all files Collapse all files

2
miext/damage/damage.c
View file

@ -1831,7 +1831,6 @@ DamageSetup (ScreenPtr pScreen)
if (!pScrPriv)
return FALSE;
#ifdef XFree86Server
#ifdef COMPOSITE
/* This is a kludge to ensure wrapping order with the composite wrapper.
* If it's done from compinit.c, then DamageSetup may be called before the
@ -1840,7 +1839,6 @@ DamageSetup (ScreenPtr pScreen)
*/
if (!noCompositeExtension)
miInitializeCompositeWrapper (pScreen);
#endif
#endif
pScrPriv->internalLevel = 0;