diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /console/display.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'console/display.c')
| -rw-r--r-- | console/display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/console/display.c b/console/display.c index 26786c11..e807c50f 100644 --- a/console/display.c +++ b/console/display.c @@ -454,7 +454,7 @@ do_mach_notify_msg_accepted (mach_port_t notify, mach_port_t send) mutex_unlock (&display->lock); return 0; } - /* The message was succesfully queued, fall through. */ + /* The message was successfully queued, fall through. */ } /* Remove request from pending queue. */ *preq = req->next; |