aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-10-15 14:53:16 +0200
committerFredrik Gustafsson <[email protected]>2013-10-15 14:53:16 +0200
commitfb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (patch)
tree26ff635e48c47611c47ec803414134244e4e8634 /lib/stdlib/src
parentc11ef50378fd68d43fe40b21489493f0e9865626 (diff)
parentbbe80d2ad4ef0ca607ba557102212cb7c9a06e2c (diff)
downloadotp-fb43535f0dd910b9013bc0bddcdb0c27f0df53f0.tar.gz
otp-fb43535f0dd910b9013bc0bddcdb0c27f0df53f0.tar.bz2
otp-fb43535f0dd910b9013bc0bddcdb0c27f0df53f0.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_server.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 6776f3deaa..5f14e48b0a 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -393,7 +393,7 @@ decode_msg(Msg, Parent, Name, State, Mod, Time, Debug, Hib) ->
end.
%%% ---------------------------------------------------
-%%% Send/recive functions
+%%% Send/receive functions
%%% ---------------------------------------------------
do_send(Dest, Msg) ->
case catch erlang:send(Dest, Msg, [noconnect]) of