bkruse: branch asterisknow r1095 - in /branches/asterisknow: ./ config/ confi...

Author: bkruse
Date: Mon Jun 18 18:52:43 2007
New Revision: 1095

URL: http://svn.digium.com/view/asterisk-gui?view=rev&am
p;rev=1095
Log:
Merged revisions 1094 via svnmerge from 
htt
ps://origsvn.digium.com/svn/asterisk-gui/trunk

........
r1094 | bkruse | 2007-06-18 18:51:43 -0500 (Mon, 18 Jun
2007) | 1 line

Updated the link so that it does not go to a fake page
(Legal and Trademark Policy)
........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/cfgbasic.html
    branches/asterisknow/config/setup/install.html

Propchange: branches/asterisknow/
------------------------------------------------------------
------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 18 18:52:43 2007
 -1,1
+1,1 
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-1080,1
085
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-1080,1
085,1094

Modified: branches/asterisknow/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/bran
ches/asterisknow/config/cfgbasic.html?view=diff&rev=1095
&r1=1094&r2=1095
============================================================
==================
--- branches/asterisknow/config/cfgbasic.html (original)
+++ branches/asterisknow/config/cfgbasic.html Mon Jun 18
18:52:43 2007
 -342,7
+342,7 
 	</td>
 </tr>
 <tr><td colspan="3"
align="center" height="18">
-		<div id="status"
class="statusbar">Copyright 2006-2007 Digium,
Inc.  Digium and Asterisk are registered <a href="http://www.digium.com/
en/company/profile/trademarkpolicy.php">trademarks&l
t;/a> of Digium, Inc.  All Rights Reserved.
<i><a href="#">Legal
Information</a></i></div>
+		<div id="status"
class="statusbar">Copyright 2006-2007 Digium,
Inc.  Digium and Asterisk are registered <a href="http://www.digium.com/
en/company/profile/trademarkpolicy.php">trademarks&l
t;/a> of Digium, Inc.  All Rights Reserved.
<i><a href="http://www.digium.com/en/company/profile/terms.
php">Legal
Information</a></i></div>
 		</td>
 </tr>
 </tbody></table>

Modified: branches/asterisknow/config/setup/install.html
URL: http://svn.digium.com/view/asterisk-gui
/branches/asterisknow/config/setup/install.html?view=diff&am
p;rev=1095&r1=1094&r2=1095
============================================================
==================
--- branches/asterisknow/config/setup/install.html
(original)
+++ branches/asterisknow/config/setup/install.html Mon Jun
18 18:52:43 2007
 -80,6
+80,5 
   	     </TD>
 	</TR>
 </TABLE>
-<div id="copyright">Copyright
&copy;2006-2007 Digium, Inc.  Digium&reg; and
Asterisk&reg; are registered <a href="http://www.digium.com/trademarks">trademar
ks</a> of Digium, Inc. All Rights Reserved.
<i><a href="http:/
/www.digium.com/gui_legal">Legal
Information</a></i></div>
-</body>
+<div id="copyright">Copyright
&copy;2006-2007 Digium, Inc.  Digium&reg; and
Asterisk&reg; are registered <a href="http://www.digium.com/
en/company/profile/trademarkpolicy.php">trademarks&l
t;/a> of Digium, Inc. All Rights Reserved.
<i><a href="http://www.digium.com/en/company/profile/terms.
php">Legal
Information</a></i></div></body>
 </html>


_______________________________________________
asterisk-gui-commits mailing list
asterisk-gui-commitslists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-g
ui-commits