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/TActiveControlAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 8c6ba430..a595e823 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -262,7 +262,7 @@ class TCallbackPageStateTracker
 	}
 
 	/**
-	 * @array list of viewstate and the changed data.
+	 * @return array list of viewstate and the changed data.
 	 */
 	protected function getChanges()
 	{
-- 
cgit v1.2.3