diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/hw/dmx/config/dmxconfig.h | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/dmx/config/dmxconfig.h')
| -rw-r--r-- | xorg-server/hw/dmx/config/dmxconfig.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/hw/dmx/config/dmxconfig.h b/xorg-server/hw/dmx/config/dmxconfig.h index 477db4a63..91a6662e3 100644 --- a/xorg-server/hw/dmx/config/dmxconfig.h +++ b/xorg-server/hw/dmx/config/dmxconfig.h @@ -36,11 +36,8 @@ #ifndef _DMXCONFIG_H_ #define _DMXCONFIG_H_ -#define DMX_DEFAULT_XKB_RULES "base" -#define DMX_DEFAULT_XKB_MODEL "pc101" -#define DMX_DEFAULT_XKB_LAYOUT "us" -#define DMX_DEFAULT_XKB_VARIANT NULL -#define DMX_DEFAULT_XKB_OPTIONS NULL + +#include <xkb-config.h> extern void dmxConfigStoreDisplay(const char *display); extern void dmxConfigStoreInput(const char *input); /* Core devices */ |