From: Leif Madsen Date: Wed, 28 Jul 2010 13:53:23 +0000 (+0000) Subject: Merged revisions 280090 via svnmerge from X-Git-Tag: 11.0.0-beta1~2533 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83fe232b9f6b314dc27484e09969aaf1952291b6;p=thirdparty%2Fasterisk.git Merged revisions 280090 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r280090 | lmadsen | 2010-07-28 08:52:50 -0500 (Wed, 28 Jul 2010) | 16 lines Merged revisions 280089 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r280089 | lmadsen | 2010-07-28 08:51:16 -0500 (Wed, 28 Jul 2010) | 9 lines Merged revisions 280088 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r280088 | lmadsen | 2010-07-28 08:50:38 -0500 (Wed, 28 Jul 2010) | 1 line Update help text to be less confusing. ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280091 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/scripts/live_ast b/contrib/scripts/live_ast index 1352762458..c1e7fade19 100755 --- a/contrib/scripts/live_ast +++ b/contrib/scripts/live_ast @@ -264,7 +264,7 @@ gdb) echo "$0 gdb gdb asterisk" echo "$0 rsync [user@]host dir copy files over to [user@]host:dir" echo "$0 gen-live-asterisk regenerate the wrapper ./live/asterisk" - echo "$0 conf-file create live.conf if it does exist" + echo "$0 conf-file create live.conf if it does not exist" exit 1 ;; esac