diff options
author | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
commit | 13dbd2e55a746ba92a580a9521e55e338276e8c4 (patch) | |
tree | fad77bc1cf3990d710ec76fb6ab74ac9f994d20c /lib/sasl/src/systools.hrl | |
parent | 8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (diff) | |
parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
download | otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.gz otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.bz2 otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/sasl/src/systools.hrl')
-rw-r--r-- | lib/sasl/src/systools.hrl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sasl/src/systools.hrl b/lib/sasl/src/systools.hrl index 9a3e98221c..da531dbee5 100644 --- a/lib/sasl/src/systools.hrl +++ b/lib/sasl/src/systools.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -60,7 +60,8 @@ %% integer() | infinity. mod = [], %% [] | {Mod, StartArgs}, Mod= atom(), %% StartArgs = list(). - start_phases = [], %% [] | {Phase, PhaseArgs}, Phase = atom(), + start_phases, %% [{Phase, PhaseArgs}] | undefined, + %% Phase = atom(), %% PhaseArgs = list(). dir = "" %% The directory where the .app file was %% found (internal use). |