diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
| commit | 666141b21e89c617ca466af62ebcb56dc4f5450c (patch) | |
| tree | 4d0cddde47b6d8cbc92395dc2091849f89d68138 /xorg-server/config | |
| parent | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (diff) | |
| parent | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (diff) | |
| download | vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.gz vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.bz2 vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwindow.h
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/wscons.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/config/wscons.c b/xorg-server/config/wscons.c index 7a5e8cc10..fb114bd71 100644 --- a/xorg-server/config/wscons.c +++ b/xorg-server/config/wscons.c @@ -53,8 +53,10 @@ struct nameint { int val; char *name; } kbdenc[] = { - KB_OVRENC, KB_ENCTAB, { -0}}; + KB_OVRENC, + KB_ENCTAB, + {0} +}; struct nameint kbdvar[] = { {KB_NODEAD | KB_SG, "de_nodeadkeys"}, |