[asterisk-commits] lmadsen: branch 1.8 r280090 - in /branches/1.8: ./ contrib/scripts/live_ast

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Jul 28 08:52:50 2010
New Revision: 280090

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

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Wed Jul 28 08:52:50 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089

Modified: branches/1.8/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/contrib/scripts/live_ast?view=diff&rev=280090&r1=280089&r2=280090
==============================================================================
--- branches/1.8/contrib/scripts/live_ast (original)
+++ branches/1.8/contrib/scripts/live_ast Wed Jul 28 08:52:50 2010
@@ -264,7 +264,7 @@
   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