aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-08-29 16:10:30 +0200
committerHenrik Nord <[email protected]>2012-08-29 16:10:30 +0200
commit0f89d26db03c7db52e49c75b238438b79684872f (patch)
tree96029519f7777bc814212b8120da3f8c786c586c /erts/emulator
parent02fd7f5c277ae599d52c9d618880de91a6fc2025 (diff)
parent2890aeb643cc8ac0b46eebebb2f26e7d348bbea1 (diff)
downloadotp-0f89d26db03c7db52e49c75b238438b79684872f.tar.gz
otp-0f89d26db03c7db52e49c75b238438b79684872f.tar.bz2
otp-0f89d26db03c7db52e49c75b238438b79684872f.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_time_sup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index e57e6a250d..bf9dca4992 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -386,7 +386,7 @@ static int clock_resolution;
/*
** The clock resolution should really be the resolution of the
** time function in use, which on most platforms
-** is 1. On VxWorks the resolution shold be
+** is 1. On VxWorks the resolution should be
** the number of ticks per second (or 1, which would work nicely to).
**
** Setting lower resolutions is mostly interesting when timers are used