From c5d0cd2824e3c3bb2f6f3834177a71c1d7b78519 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 27 Mar 2007 00:47:38 +0000
Subject: merge from 3.0 branch till 1779.

---
 framework/3rdParty/readme.html | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'framework/3rdParty')

diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html
index 6b79f694..4da09643 100644
--- a/framework/3rdParty/readme.html
+++ b/framework/3rdParty/readme.html
@@ -37,7 +37,7 @@ projects.
 </tr>
 <tr>
   <td><a href="TinyMCE">TinyMCE</a></td>
-  <td><a href="http://tinymce.moxiecode.com/">TinyMCE Javascript Content Editor</a> (v2.0.5.1)</td>
+  <td><a href="http://tinymce.moxiecode.com/">TinyMCE Javascript Content Editor</a> (v2.1)</td>
   <td><a href="tiny_mce/license.txt">GNU LIBRARY GENERAL PUBLIC LICENSE</a></td>
   <td>System.Web.UI.WebControls.THtmlArea</td>
   <td>TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way.</td>
@@ -87,7 +87,7 @@ projects.
 </tr>
 
 <tr>
-	<td><a href="../Web/Javascripts/effects/rico.js">../Web/Javascripts/effects/rico.js</a></td>
+	<td>Rico Color is used in the <a href="../web/Javascripts/prado/colorpicker/colorpicker.js">colorpicker.js</a></td>
 	<td><a href="http://openrico.org/">Rico</a></td>
 	<td><a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License v2</a></td>
 	<td>N.A.</td>
@@ -101,21 +101,13 @@ projects.
 	<td>Core of Prado javascript library.</td>
 </tr>
 <tr>
-	<td><a href="../Web/Javascripts/extra/logger.js">../Web/Javascripts/extra/logger.js</a></td>
+	<td><a href="../Web/Javascripts/prado/logger/logger.js">../Web/Javascripts/prado/logger/logger.js</a></td>
 	<td><a href="http://gleepglop.com/javascripts/logger/">http://gleepglop.com/javascripts/logger/</a> <a href="http://slayeroffice.com">http://slayeroffice.com</a></td>
 	<td>None</td>
 	<td>TJavascriptLogger</td>
 	<td>Javascript logger by Corey Johnson. Object Tree by S.G. Chipman.</td>
 </tr>
 
-<tr>
-	<td><a href="../Web/Javascripts/extra/json.js">../Web/Javascripts/extra/json.js</a></td>
-	<td><a href="http://www.JSON.org">http://www.JSON.org</a></td>
-	<td><a href="http://www.json.org/license.html">MIT based</a></td>
-	<td>N.A.</td>
-	<td>Has "The Software shall be used for Good, not Evil." clause.</td>
-</tr>
-
 <tr>
 	<td><a href="../../demos/quickstart/protected/index/Zend">../../demos/quickstart/protected/index/Zend</a></td>
 	<td><a href="http://framework.zend.com">Zend Framework</a></td>
-- 
cgit v1.2.3