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

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
This commit is contained in:
Peter Hutterer 2008-04-22 18:04:05 +09:30
commit 8190ef8754
195 changed files with 2129 additions and 36734 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/xnest/Args.c
View file

@ -57,11 +57,6 @@ void ddxInitGlobals(void)
extern Bool noCompositeExtension;
noCompositeExtension = TRUE;
#endif
#ifdef XKB
extern Bool noXkbExtension;
noXkbExtension = TRUE;
#endif
}
int