From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Jan 2014 22:41:46 +0100 Subject: Happy 2014! (cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae) Conflicts: framework/Data/Common/Mssql/TMssqlMetaData.php framework/Data/Common/Mysql/TMysqlMetaData.php framework/Data/Common/Oracle/TOracleMetaData.php framework/Data/Common/Pgsql/TPgsqlMetaData.php framework/Data/Common/Sqlite/TSqliteMetaData.php framework/Data/Common/TDbMetaData.php framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php framework/Wsat/TWsatARGenerator.php framework/Wsat/TWsatService.php framework/Wsat/pages/TWsatGenerateAR.php framework/Wsat/pages/TWsatHome.php framework/Wsat/pages/TWsatLogin.php framework/Wsat/pages/TWsatScaffolding.php --- framework/Collections/TStack.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/Collections/TStack.php') diff --git a/framework/Collections/TStack.php b/framework/Collections/TStack.php index 06c97046..07379d09 100644 --- a/framework/Collections/TStack.php +++ b/framework/Collections/TStack.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TStack.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections @@ -180,7 +180,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable * TStackIterator is used by TStack. It allows TStack to return a new iterator * for traversing the items in the list. * - * @deprecated Issue 264 : ArrayIterator should be used instead + * @deprecated Issue 264 : ArrayIterator should be used instead * @author Qiang Xue * @version $Id: TStack.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections -- cgit v1.2.3