diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
| commit | e3a6ca7bffc785a13361efdbf81ef4776c050df0 (patch) | |
| tree | 2277a7dccab07794bd37b255ae6b5e2716e0c855 /xorg-server/include | |
| parent | 780fcf7fcf5701c79568c95f32823cfa8e564665 (diff) | |
| parent | b683b8f5675e280a6dd4ab82d6b9394182798b55 (diff) | |
| download | vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.gz vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.bz2 vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/grabs.c
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/inputstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index 518e2f4f7..c3297db64 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -544,7 +544,7 @@ typedef struct _DeviceIntRec { DeviceRec public; DeviceIntPtr next; Bool startup; /* true if needs to be turned on at - server intialization time */ + server initialization time */ DeviceProc deviceProc; /* proc(DevicePtr, DEVICE_xx). It is used to initialize, turn on, or turn off the device */ |