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/xkb/ddxLoad.c | |
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/xkb/ddxLoad.c')
-rw-r--r-- | xorg-server/xkb/ddxLoad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index 3c98b8de7..7f852bd15 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#ifdef HAVE_XKB_CONFIG_H #include <xkb-config.h> -#endif #include <stdio.h> #include <ctype.h> |