aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/xkbUtils.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 14:39:51 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 14:39:51 +0000
commitf37fe8ec030759069bd7c00cecf2fd55c8e6f9ff (patch)
tree03b82272fdd55070146d5c6c6aa4062446c0f0f8 /xorg-server/xkb/xkbUtils.c
parentff48c0d9098080b51ea12710029135916d117806 (diff)
downloadvcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.gz
vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.bz2
vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.zip
svn merge -r516:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkbUtils.c')
-rw-r--r--xorg-server/xkb/xkbUtils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c
index 5b317c977..e28799759 100644
--- a/xorg-server/xkb/xkbUtils.c
+++ b/xorg-server/xkb/xkbUtils.c
@@ -753,7 +753,7 @@ XkbSrvLedInfoPtr sli;
if (cause!=NULL) {
xkbControlsNotify cn;
cn.numGroups= ctrls->num_groups;
- cn.changedControls|= XkbControlsEnabledMask;
+ cn.changedControls= XkbControlsEnabledMask;
cn.enabledControls= ctrls->enabled_ctrls;
cn.enabledControlChanges= (ctrls->enabled_ctrls^old);
cn.keycode= cause->kc;