diff options
author | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
commit | 5620b434415d7c7d7060dbeff2c71d6bb96b91da (patch) | |
tree | 28d681356120a3a5fc8c4fba7c2e9b2acfd64718 /lib/stdlib/src/gen_fsm.erl | |
parent | ddfe258f12a7706f3aea4f20bf6fc46b839ab70c (diff) | |
parent | c826b7309e57e33b1209d5b6c0f15a0e26122729 (diff) | |
download | otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.gz otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.bz2 otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.zip |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
lib/stdlib/doc/src/binary.xml
Diffstat (limited to 'lib/stdlib/src/gen_fsm.erl')
-rw-r--r-- | lib/stdlib/src/gen_fsm.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl index 57734a075c..80866c0806 100644 --- a/lib/stdlib/src/gen_fsm.erl +++ b/lib/stdlib/src/gen_fsm.erl @@ -320,7 +320,7 @@ name_to_pid(Name) -> undefined -> case global:whereis_name(Name) of undefined -> - exit(could_not_find_registerd_name); + exit(could_not_find_registered_name); Pid -> Pid end; |