[asterisk-commits] lmadsen: branch 1.6.2 r280089 - in /branches/1.6.2: ./ contrib/scripts/live_ast

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Jul 28 08:51:16 2010
New Revision: 280089

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280089
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/contrib/scripts/live_ast

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Jul 28 08:51:16 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945
+/branches/1.4:1-279056,279206,279945,280088

Modified: branches/1.6.2/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/contrib/scripts/live_ast?view=diff&rev=280089&r1=280088&r2=280089
==============================================================================
--- branches/1.6.2/contrib/scripts/live_ast (original)
+++ branches/1.6.2/contrib/scripts/live_ast Wed Jul 28 08:51:16 2010
@@ -255,7 +255,7 @@
   echo "$0 samples              make samples"
   echo "$0 run [params]         asterisk [params]"
   echo "$0 gdb                  gdb 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