From 9af7e1312620de671c4312fbfd723b59ee4685df Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 21 Jun 2006 13:42:04 +0000
Subject: Merge from 3.0 branch till 1191.

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

(limited to 'HISTORY')

diff --git a/HISTORY b/HISTORY
index b3f5847f..a041c0b3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -20,9 +20,12 @@ CHG: ensureChildControls() is now invoked in TControl::initRecursive (Qiang)
 CHG: Postback enabled control will always disable default client-side browser action. (Qiang)
 CHG: CSS and JS files in a theme are now included in page in alphabetic order (Qiang)
 ENH: Ticket#206 - Added OnValidate, OnError, OnSuccess events to validators (Qiang)
+ENH: Ticket#230 - Added TDataList.EmptyTemplate property (Qiang)
+ENH: Ticket#231 - Added TButton.ButtonType property to allow reset button (Qiang)
 ENH: Ticket#232 - Allow <%# %> and <%= %> embedded within property values (Qiang)
 ENH: TRepeater, TDataList and TDataGrid will store data indices in DataKeys if DataKeyField is not set. (Qiang)
 ENH: Added TPageService.BasePageClass property (Qiang)
+ENH: Added TDataGrid.EmptyTemplate property (Qiang)
 
 Version 3.0.1 June 4, 2006
 ==========================
-- 
cgit v1.2.3