mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
Merge branch 'master' into mpx
Conflicts: Xext/sampleEVI.c
This commit is contained in:
commit
0ac1755977
44 changed files with 494 additions and 456 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue