Merge branch 'master' into mpx

Conflicts:

	Xext/sampleEVI.c
This commit is contained in:
Peter Hutterer 2008-01-26 13:55:07 +10:30
commit 0ac1755977
44 changed files with 494 additions and 456 deletions

View file

@ -1796,6 +1796,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
if (!tmp)
return FALSE;
dst->geom->sections = tmp;
dst->geom->num_sections = src->geom->num_sections;
for (i = 0,
ssection = src->geom->sections,