pari: branch aadk r1092 - in /branches/aadk: ./ config/meetme.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Mon Jun 18 15:55:01 2007
New Revision: 1092

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1092
Log:
Merged revisions 489-500,506,508-510,513-518,520-531,533-535,537,539-540,542,544,546,548,550,552,554,556-557,559,562,564-566,569,571,573-577,580-586,589-604,606-611,614-616,618-619,621-622,624-625,633-634,636,638-640,648-650,660-676,678-679,682-684,687-688,695-696,698-702,704-712,714-716,718-719,721-722,724-725,727-746,749-750,752-753,757-767,769-771,774-780,782-783,785-786,788-789,791-792,794-795,797-800,802-803,808-810,812-816,821-825,827-835,837,839-840,842-847,849-850,853-855,862-864,867,869-870,873-878,880,884-886,889-898,900-903,906-909,911,917,939-940,946,948,950,956-960,962-963,967,971-976,984,989,1022-1030,1032,1035-1043,1050-1055,1057-1060,1062-1063,1065-1067,1069-1071,1081-1084,1086-1090 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk


Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/meetme.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 18 15:55:01 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-767,769-1081,1085
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090

Modified: branches/aadk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/meetme.html?view=diff&rev=1092&r1=1091&r2=1092
==============================================================================
--- branches/aadk/config/meetme.html (original)
+++ branches/aadk/config/meetme.html Mon Jun 18 15:55:01 2007
@@ -285,7 +285,7 @@
 		}
 		uri += build_action('append', p, "rooms","conf", newvalue );  p++;
 
-		makerequest('u','extensions.conf',uri,
+		makerequest('u','meetme.conf',uri,
 			function(t){
 				if( temp_rooms_r ==  -1 ){ // add
 					f.stored_config.catbyname.rooms.fields.push( newvalue );