From cb0aeb81d77d7170196f1b667978f56c6018100b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 25 Nov 2006 20:51:43 +0000
Subject: merge from 3.0 branch till 1508.

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

(limited to 'HISTORY')

diff --git a/HISTORY b/HISTORY
index f2e5ab18..0f07bb13 100644
--- a/HISTORY
+++ b/HISTORY
@@ -19,9 +19,11 @@ Version 3.0.6 December 4, 2006
 ==============================
 BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
 BUG: TTableCell should render &nbsp; only when Text is not set and there's no child (Qiang)
+ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)
-CHG: constructUrl() now encodes & into &amp; by default (Qiang)
+CHG: Ticket#454 - Redundant PHP Version Check
 CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
+CHG: THttpRequest.constructUrl() now encodes ampersand by default (Qiang)
 
 Version 3.0.5 October 23, 2006
 ==============================
-- 
cgit v1.2.3