pari: branch asterisknow r721 - in /branches: aadk/ aadk/config/setup/ asteri...

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Fri Apr 20 17:14:12 2007
New Revision: 721

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=721
Log:
Merged revisions 720 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r720 | pari | 2007-04-20 17:12:41 -0500 (Fri, 20 Apr 2007) | 1 line

'Dial Plans' labeled as 'Calling Plan'
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/setup/7.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/setup/7.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 20 17:14:12 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-717
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-720

Modified: branches/aadk/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/7.html?view=diff&rev=721&r1=720&r2=721
==============================================================================
--- branches/aadk/config/setup/7.html (original)
+++ branches/aadk/config/setup/7.html Fri Apr 20 17:14:12 2007
@@ -380,7 +380,7 @@
 				<span id="noanaloglines" style="display:none"><I>&nbsp;No Analog lines installed.</I></span>
 			</TD>
 		</TR>
-		<TR>	<TD>Calling Rule:</TD>
+		<TR>	<TD>Dial Plan:</TD>
 			<TD><select size='1' id='context' style='width:120px' class="input9"></select>
 				<input type='hidden' id='mailbox'><input type='hidden' id='group'>
 			</TD>

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 20 17:14:12 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-717
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-720

Modified: branches/asterisknow/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/7.html?view=diff&rev=721&r1=720&r2=721
==============================================================================
--- branches/asterisknow/config/setup/7.html (original)
+++ branches/asterisknow/config/setup/7.html Fri Apr 20 17:14:12 2007
@@ -380,7 +380,7 @@
 				<span id="noanaloglines" style="display:none"><I>&nbsp;No Analog lines installed.</I></span>
 			</TD>
 		</TR>
-		<TR>	<TD>Calling Rule:</TD>
+		<TR>	<TD>Dial Plan:</TD>
 			<TD><select size='1' id='context' style='width:120px' class="input9"></select>
 				<input type='hidden' id='mailbox'><input type='hidden' id='group'>
 			</TD>