diff options
| author | Sverker Eriksson <[email protected]> | 2012-04-27 14:38:24 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-04-27 14:38:24 +0200 |
| commit | 3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c (patch) | |
| tree | c8e2821c3413475ca9cbf6ee2f5bbe8a1ce5230e /erts/etc | |
| parent | 33fe8806939849c47b8ec5de91b8e8ef94a9f1df (diff) | |
| parent | 46f5b571ba92c29a0471d9619f372b102ec4a6c0 (diff) | |
| download | otp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.tar.gz otp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.tar.bz2 otp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.zip | |
Merge branch 'maint-r15' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 19b3bb82ef..c9aee16def 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -121,9 +121,11 @@ static char *plusM_other_switches[] = { /* +s arguments with values */ static char *pluss_val_switches[] = { "bt", + "bwt", "cl", "ct", "wt", + "ws", "ss", NULL }; |