From 2cc93773feb5e76d2dd002b1dcd463a01d606794 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 28 Apr 2006 11:10:06 +0000
Subject: Merge from 3.0 branch till 985.

---
 framework/3rdParty/TinyMCE/tiny_mce.md5 |   2 +-
 framework/3rdParty/TinyMCE/tiny_mce.tar | Bin 3051520 -> 3164160 bytes
 framework/3rdParty/readme.html          |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/3rdParty')

diff --git a/framework/3rdParty/TinyMCE/tiny_mce.md5 b/framework/3rdParty/TinyMCE/tiny_mce.md5
index 861556e5..1ee34468 100644
--- a/framework/3rdParty/TinyMCE/tiny_mce.md5
+++ b/framework/3rdParty/TinyMCE/tiny_mce.md5
@@ -1 +1 @@
-b79c5807630d8324b2c968eb563e9076 *tiny_mce.tar
+505c2761e878f40d5451115bd5643355 *tiny_mce.tar
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/3rdParty/TinyMCE/tiny_mce.tar
index f57b3509..663abb34 100644
Binary files a/framework/3rdParty/TinyMCE/tiny_mce.tar and b/framework/3rdParty/TinyMCE/tiny_mce.tar differ
diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html
index 923e9056..ea5b05db 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.2)</td>
+  <td><a href="http://tinymce.moxiecode.com/">TinyMCE Javascript Content Editor</a> (v2.0.5.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>
-- 
cgit v1.2.3