aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-10-15 18:02:38 +0200
committerSverker Eriksson <[email protected]>2013-10-15 18:02:38 +0200
commit21270f86ab03d976ce3137c84d21e43ce6bc404b (patch)
tree98843d726d270f8f65fa4371761829117d01239a /erts/etc
parentfb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (diff)
parent356c1e9312a640ac211b6d5d4110372742acfcde (diff)
downloadotp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.gz
otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.bz2
otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.zip
Merge branch 'maint'
Conflicts: erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/erlexec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 5ef7df0d8d..f212502bb0 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -109,6 +109,10 @@ static char *plusM_other_switches[] = {
"Mamcbf",
"Mrmcbf",
"Mmcs",
+ "Mscs",
+ "Mscmgc",
+ "Msco",
+ "Mscrpm",
"Ye",
"Ym",
"Ytp",