diff options
| author | Micael Karlberg <[email protected]> | 2012-02-29 10:46:07 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-29 10:46:07 +0100 |
| commit | 78cbfaad628aa2d548432e251ef0943b46a502b2 (patch) | |
| tree | c366e69c70e3ff0eb8e6e3c2d443d277452b6398 /lib/megaco/examples/meas/meas.sh.skel.src | |
| parent | 414db1d25aac02f246d60d835833c19bbe8d8620 (diff) | |
| parent | dfd5f918b84e08d648c4e5965a42223f5b6bd0c1 (diff) | |
| download | otp-78cbfaad628aa2d548432e251ef0943b46a502b2.tar.gz otp-78cbfaad628aa2d548432e251ef0943b46a502b2.tar.bz2 otp-78cbfaad628aa2d548432e251ef0943b46a502b2.zip | |
Merge branch 'bmk/megaco/updating_meas' into bmk/megaco/megaco31601_integration/r15
Conflicts:
lib/megaco/doc/src/notes.xml
lib/megaco/src/app/megaco.appup.src
Diffstat (limited to 'lib/megaco/examples/meas/meas.sh.skel.src')
| -rw-r--r-- | lib/megaco/examples/meas/meas.sh.skel.src | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/megaco/examples/meas/meas.sh.skel.src b/lib/megaco/examples/meas/meas.sh.skel.src index c7bd6cdd2a..ecf463b9c6 100644 --- a/lib/megaco/examples/meas/meas.sh.skel.src +++ b/lib/megaco/examples/meas/meas.sh.skel.src @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2007-2011. All Rights Reserved. +# Copyright Ericsson AB 2007-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 @@ -32,6 +32,7 @@ STOP="-s init stop" ERL="erl \ -noshell \ + +sbt tnnps \ -pa $MEAS_HOME \ $MEAS_DEFAULT \ $STOP" |