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
---
 buildscripts/apigen/pradosoft/@layout.latte       | 2 +-
 buildscripts/texbuilder/quickstart/quickstart.tex | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'buildscripts')

diff --git a/buildscripts/apigen/pradosoft/@layout.latte b/buildscripts/apigen/pradosoft/@layout.latte
index 2790d92c..266f0e17 100644
--- a/buildscripts/apigen/pradosoft/@layout.latte
+++ b/buildscripts/apigen/pradosoft/@layout.latte
@@ -182,7 +182,7 @@ the file LICENSE.md that was distributed with this source code.
   <a href="/support/">Contact Us</a>
   <br/>
   {$config->title} API documentation generated by <a href="http://apigen.org">{$generator} {$version}</a>
-  <br/>Copyright &copy; 2006-2013 by the PRADO Group.<br/>
+  <br/>Copyright &copy; 2006-2014 by the PRADO Group.<br/>
   <a title="Powered by PRADO" href="http://www.pradosoft.com/"><img src="http://www.pradosoft.com/images/powered2.gif" style="border-width:0px;" alt="Powered by PRADO" /></a>
 </div>
 
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 41258800..29c76afc 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -53,7 +53,7 @@
 %----------------- TITLE --------------
 
 \title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial
-    \thanks{Copyright 2004-2013. All Rights Reserved.}
+    \thanks{Copyright 2004-2014. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
 \date{\today}
@@ -78,7 +78,7 @@ Prado quick start doc
 \chapter*{License}
 \addcontentsline{toc}{chapter}{License}
 PRADO is free software 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