diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
| commit | db967c2b0fd8506b9e1cf7574d5fb927bec786c5 (patch) | |
| tree | 5444de1e304af7b5ae8c4b590a08b1b5964c7eca /xorg-server/test | |
| parent | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (diff) | |
| parent | 0bef135026040688be97af98cc99cc82f93838e8 (diff) | |
| download | vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.gz vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.bz2 vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/devices.c
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/xtest.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/test/xtest.c b/xorg-server/test/xtest.c index 99e218541..402d9ceba 100644 --- a/xorg-server/test/xtest.c +++ b/xorg-server/test/xtest.c @@ -76,8 +76,6 @@ xtest_init_devices(void) InitAtoms(); SyncExtensionInit(); - XkbInitPrivates(); - /* this also inits the xtest devices */ InitCoreDevices(); |