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
---
index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'index.html')
diff --git a/index.html b/index.html
index 37a2a60d..4fb55fcf 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
PRADO Framework for PHP 5
Version 3.2.3
-Copyright© 2004-2013 by Prado Software
+Copyright© 2004-2014 by Prado Software
All Rights Reserved.
@@ -152,7 +152,7 @@ The PRADO framework and the included demos are free software. They are released
the terms of the following BSD License.
-Copyright 2004-2013 by The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2014 by The PRADO Group (http://www.pradosoft.com)
All rights reserved.
--
cgit v1.2.3