From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
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
---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'COPYRIGHT')

diff --git a/COPYRIGHT b/COPYRIGHT
index daa3d02c..4d7a65d8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 The PRADO framework and the included demos are free software.
 They are released under the terms of the following BSD License.
 
-Copyright 2004-2013, The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2014, The PRADO Group (http://www.pradosoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-- 
cgit v1.2.3