From 112d86bb08a1dd4bde14005f757c95b0fc7a5a21 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 4 Jun 2006 20:51:27 +0000
Subject: Merge from 3.0 branch till 1140.

---
 HISTORY | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'HISTORY')

diff --git a/HISTORY b/HISTORY
index 8e82239b..3d01115c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -34,8 +34,11 @@ ENH: refactored TUserManager and TAuthManager so that they are easier to be exte
 ENH: template syntax now supports setting event handler via subproperties (Qiang)
 CHG: Ticket#151 - URL format is modified to handle empty GET values (Qiang)
 CHG: Ticket#153 - TAssetManager now ignores .svn directories (Qiang)
+CHG: Changed TControl::onBubbleEvent() to TControl::bubbleEvent() (Qiang)
 NEW: TTableHeaderRow, TTableFooterRow and table section support (Qiang)
 NEW: TCompositeControl (Qiang)
+NEW: TTextProcessor (Qiang)
+NEW: TMarkdown (Wei)
 NEW: Blog demo (Qiang)
 
 Version 3.0.0 May 1, 2006
-- 
cgit v1.2.3