diff options
| author | Peter Andersson <[email protected]> | 2011-11-30 11:51:00 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-11-30 11:51:00 +0100 |
| commit | b243b515c69a2585829ec65307ae5d0aff9ac2c6 (patch) | |
| tree | 7d69a9ec25fbab8a63741cc59f663b7b1c025280 /lib/stdlib/src/supervisor.erl | |
| parent | 3cce9003a2ebd9aa581ae248c30dd0cc64568397 (diff) | |
| parent | 81f08713ff0ea3e49c2432e489a74f49ab6ebc42 (diff) | |
| download | otp-b243b515c69a2585829ec65307ae5d0aff9ac2c6.tar.gz otp-b243b515c69a2585829ec65307ae5d0aff9ac2c6.tar.bz2 otp-b243b515c69a2585829ec65307ae5d0aff9ac2c6.zip | |
Merge remote branch 'upstream/master' into peppe/common_test/css_fixes
Diffstat (limited to 'lib/stdlib/src/supervisor.erl')
| -rw-r--r-- | lib/stdlib/src/supervisor.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index 2dd5ccce7a..42ea42f42e 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -37,7 +37,7 @@ %%-------------------------------------------------------------------------- --type child() :: pid() | 'undefined'. +-type child() :: 'undefined' | pid() | [pid()]. -type child_id() :: term(). -type mfargs() :: {M :: module(), F :: atom(), A :: [term()] | undefined}. -type modules() :: [module()] | 'dynamic'. |