From 880d67c83a2fe85cc141b52b243bdf2a78eaca3d Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 16 Jul 2011 15:29:13 +0000
Subject: branch 3.1: some doc/version update

---
 HISTORY                 | 11 +++++++++++
 UPGRADE                 |  7 +++++--
 framework/PradoBase.php |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 3fab5bbf..1c9398fd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,14 @@
+Version 3.1.10 Jul 17, 2011
+BUG: Added missing timeout on TCacheHttpSession (ctrlaltca)
+BUG: Issue#332 - Minor typos (ctrlaltca)
+BUG: Issue#333 - Wrong tracker url on quickstart (ctrlaltca)
+BUG: Issue#334 - Wrong variable acces in TTemplateControlInheritable (ctrlaltca)
+BUG: Issue#335 - setcookie() bug (ctrlaltca)
+BUG: Issue#343 - New TTabPanel breaks compatibility (ctrlaltca)
+BUG: Issue#349 - Security problem in TActiveFileUpload control (Gabor)
+ENH: Merged a bit TPager's view style with TDataGridPager's one adding first/last buttons to TDataGridPagerStyle (ctrlaltca)
+ENH: Reworked the patch for #103 so that it actually fixes the use of TActiveCustomValidator with normal Postback controls (ctrlaltca)
+
 Version 3.1.9 June 3, 2011
 BUG: Issue#280 - Documentation has been updated
 BUG: Issue#311 - TDataList : FooterStyle not used (ctrlaltca)
diff --git a/UPGRADE b/UPGRADE
index cb49c79a..fbf9bdc5 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,6 +1,6 @@
 
-         Upgrading Instructions for PRADO Framework v3.1.9
-         =================================================
+         Upgrading Instructions for PRADO Framework v3.1.10
+         ==================================================
 
 !!!IMPORTANT!!!
 
@@ -9,6 +9,9 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions
 for both A and B.
 
+Upgrading from v3.1.9
+---------------------
+
 Upgrading from v3.1.8
 ---------------------
 - An new "TranslateDefaultCulture" option has been added to TGlobalization that lets you choose if Prado
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 8333568c..64289174 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -71,7 +71,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.1.9';
+		return '3.1.10';
 	}
 
 	/**
-- 
cgit v1.2.3