diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-01 13:14:43 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-01 13:14:43 +0000 |
| commit | 6ed6717dee7a472ae12f3f0e3c526c68425da8e7 (patch) | |
| tree | 7bb7d4c72424d0409dd38796c3c0948172563090 /xkbcomp/xkbcomp.c | |
| parent | b320c441ab5ad04ea4a6766d0a178fc7c0ea4105 (diff) | |
| parent | 9af25cb02d1d2f86cd6e3cc1d18701f7304defdd (diff) | |
| download | vcxsrv-6ed6717dee7a472ae12f3f0e3c526c68425da8e7.tar.gz vcxsrv-6ed6717dee7a472ae12f3f0e3c526c68425da8e7.tar.bz2 vcxsrv-6ed6717dee7a472ae12f3f0e3c526c68425da8e7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xkbcomp/xkbcomp.c')
| -rw-r--r-- | xkbcomp/xkbcomp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c index a211bf6ec..31badbf58 100644 --- a/xkbcomp/xkbcomp.c +++ b/xkbcomp/xkbcomp.c @@ -1037,6 +1037,7 @@ main(int argc, char *argv[]) ok = False;
break;
}
+ result.xkb->device_spec = device_id;
}
else if (inputFormat == INPUT_XKM) /* parse xkm file */
{
@@ -1053,6 +1054,7 @@ main(int argc, char *argv[]) ERROR1("Cannot read XKM file \"%s\"\n", inputFile);
ok = False;
}
+ result.xkb->device_spec = device_id;
}
else
{
|