From e30048fca6e6cb351f311b2dc039f31210db8eec Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 25 Jan 2007 13:41:32 +0000
Subject: merge from 3.0 branch till 1656.

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

(limited to 'HISTORY')

diff --git a/HISTORY b/HISTORY
index 407665fc..cce10900 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,9 +1,9 @@
 Version 3.1.0 beta to be released
 =================================
 BUG: Ticket#517 - Quickstart I18N sample: conflicting module ID (Wei)
-BUG: Ticket#521 - comment tag on TActiveButton stop callback (Wei)
 ENH: Ticket#513 - Display last modified / revision in quickstart (Wei)
 ENH: Ticket#519 - Update TActiveRecord implementation (Wei)
+BUG: Ticket#521 - comment tag on TActiveButton stop callback (Wei)
 ENH: Added PRADO_CHMOD constant so that users can specify the permission of PRADO-created directories (Qiang)
 ENH: Add Display property to TWebControl (Wei)
 
@@ -32,7 +32,8 @@ NEW: TGlobalStateCacheDependency, TChainedCacheDependency, TApplicationStateCach
 Version 3.0.7 to be released 
 ============================
 BUG: Ticket#481 - Unable to cancel navigation when handling OnSideBarButtonClickEvent (Qiang)
-BUG: Ticket#505,#508 (Wei)
+BUG: Ticket#505 - cultureInfo::getEnglishName does not return an arrary (Wei)
+BUG: Ticket#508 - CultureInfo class: PHP Notice because of missing static declaration (Wei)
 BUG: typo in THttpResponse.writeFile() about sending headers (Qiang)
 
 Version 3.0.6 December 4, 2006
-- 
cgit v1.2.3