[svn-commits] lmadsen: trunk r280091 - in /trunk: ./ contrib/scripts/live_ast

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Wed Jul 28 08:53:23 2010
New Revision: 280091

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

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/live_ast

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jul 28 08:53:23 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090

Modified: trunk/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/live_ast?view=diff&rev=280091&r1=280090&r2=280091
==============================================================================
--- trunk/contrib/scripts/live_ast (original)
+++ trunk/contrib/scripts/live_ast Wed Jul 28 08:53:23 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