From 0f3a577bed4d828472469675e90fcab032e33f44 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 2 Jun 2006 18:27:02 +0000
Subject: merge from 3.0 branch till 1133.

---
 framework/3rdParty/readme.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'framework/3rdParty/readme.html')

diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html
index f67526ae..590f1174 100644
--- a/framework/3rdParty/readme.html
+++ b/framework/3rdParty/readme.html
@@ -133,7 +133,15 @@ projects.
 	<td>Slightly modified to work nicely with E_STRICT in php 5.</td>	
 </tr>
 
+<tr>
+	<td><a href="Markdown">Markdown</a></td>
+	<td><a href="http://www.michelf.com/projects/php-markdown/">PHP Markdown</a></td>
+	<td><a href="Markdown/License.text">BSD</a></td>
+	<td>System.Web.UI.WebControls.TMarkdown</td>
+	<td>PHP5 class implementation of the PHP Markdown.</td>	
+</tr>
+
 </table>
 </p>
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3