From dc727f26dab81c6ae6d06aef6db966a991e2342b Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Mon, 22 Feb 2010 08:10:30 +0000
Subject: Merged /branches/3.1:r2773 into trunk

---
 framework/Web/UI/ActiveControls/TBaseActiveControl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/ActiveControls/TBaseActiveControl.php')

diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index f301f2c3..92dd3194 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -30,11 +30,11 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
 class TBaseActiveControl extends TComponent
 {
 	/**
-	 * @TMap map of active control options.
+	 * @var TMap map of active control options.
 	 */
 	private $_options;
 	/**
-	 * @TControl attached control.
+	 * @var TControl attached control.
 	 */
 	private $_control;
 
-- 
cgit v1.2.3