aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
committermarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
commitac799961eb382e48c68ffda1e1a89b346eb97f81 (patch)
tree96ab9494b7313d30b9b3d37480937fa07136b27b /xorg-server/os
parente957ce706e896f5ed802d81f26a2663578f8153f (diff)
parent8c5587d9be904856f7e449a144c2819a8e310599 (diff)
downloadvcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.gz
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.bz2
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 10 oct 2012
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/osinit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index 8a959a39c..76e170ec5 100644
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
@@ -129,7 +129,7 @@ OsSigHandler(int signo)
#ifdef SA_SIGINFO
if (sip->si_code == SI_USER) {
- ErrorFSigSafe("Recieved signal %u sent by process %u, uid %u\n", signo,
+ ErrorFSigSafe("Received signal %u sent by process %u, uid %u\n", signo,
sip->si_pid, sip->si_uid);
}
else {