[asterisk-commits] jrose: trunk r329564 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Jul 26 09:27:31 2011
New Revision: 329564

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329564
Log:
Merged revisions 329538 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329538 | jrose | 2011-07-26 09:19:34 -0500 (Tue, 26 Jul 2011) | 11 lines
  
  Merged revisions 329529 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329529 | jrose | 2011-07-26 09:04:55 -0500 (Tue, 26 Jul 2011) | 5 lines
    
    Changes sound file for prepend "then-press-pound" to "vm-then-pound" which is the same
    prompt, only it turned out "then-press-pound" was part of extra sounds. Also, vm is more
    appropriate anyway.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-merged (original)
+++ branch-10-merged Tue Jul 26 09:27:31 2011
@@ -1,1 +1,1 @@
-/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528
+/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528,329538

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=329564&r1=329563&r2=329564
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Jul 26 09:27:31 2011
@@ -873,7 +873,7 @@
  * 3. Something way different like providing instructions before a time out or a post-recording menu.  This would require
  * more effort than either of the other two.
  */
-static char vm_prepend_timeout[80] = "then-press-pound";
+static char vm_prepend_timeout[80] = "vm-then-pound";
 
 static struct ast_flags globalflags = {0};