[asterisk-commits] murf: branch murf/AEL2-1.2 r48413 - in /team/murf/AEL2-1.2: ./ sounds/silence/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Dec 12 11:49:24 2006
New Revision: 48413

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48413
Log:
Merged revisions 48398,48403 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48398 | mogorman | 2006-12-11 16:00:04 -0700 (Mon, 11 Dec 2006) | 2 lines

the english language can be a tricky beast

........
r48403 | kpfleming | 2006-12-11 22:11:13 -0700 (Mon, 11 Dec 2006) | 2 lines

add silence files

........

Added:
    team/murf/AEL2-1.2/sounds/silence/
      - copied from r48403, branches/1.2/sounds/silence/
    team/murf/AEL2-1.2/sounds/silence/1.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/1.gsm
    team/murf/AEL2-1.2/sounds/silence/10.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/10.gsm
    team/murf/AEL2-1.2/sounds/silence/2.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/2.gsm
    team/murf/AEL2-1.2/sounds/silence/3.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/3.gsm
    team/murf/AEL2-1.2/sounds/silence/4.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/4.gsm
    team/murf/AEL2-1.2/sounds/silence/5.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/5.gsm
    team/murf/AEL2-1.2/sounds/silence/6.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/6.gsm
    team/murf/AEL2-1.2/sounds/silence/7.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/7.gsm
    team/murf/AEL2-1.2/sounds/silence/8.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/8.gsm
    team/murf/AEL2-1.2/sounds/silence/9.gsm
      - copied unchanged from r48403, branches/1.2/sounds/silence/9.gsm
Modified:
    team/murf/AEL2-1.2/   (props changed)
    team/murf/AEL2-1.2/sounds.txt

Propchange: team/murf/AEL2-1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 12 11:49:24 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-48397
+/branches/1.2:1-48412

Modified: team/murf/AEL2-1.2/sounds.txt
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/sounds.txt?view=diff&rev=48413&r1=48412&r2=48413
==============================================================================
--- team/murf/AEL2-1.2/sounds.txt (original)
+++ team/murf/AEL2-1.2/sounds.txt Tue Dec 12 11:49:24 2006
@@ -730,7 +730,7 @@
 
 ; Silence directory
 
-%1.gsm%1 seconds of silence
+%1.gsm%1 second of silence
 
 %2.gsm%2 seconds of silence