summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-07-22 08:08:24 +0000
committerChristophe.Boulain <>2009-07-22 08:08:24 +0000
commitaec63878c1267f0da719572b41e714582f56636a (patch)
tree779bafd39e7fc14e4cf062b4fb3a77f90c619c05
parentd5b8c9111602293ed69f4e99d885ac170a86985e (diff)
Prepare for next release
-rw-r--r--HISTORY2
-rw-r--r--UPGRADE5
-rw-r--r--buildscripts/texbuilder/quickstart/quickstart.tex2
-rw-r--r--framework/PradoBase.php2
-rw-r--r--index.html2
5 files changed, 9 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index f7b9a088..23f55d06 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,5 @@
+Version 3.1.7 To be released
+
Version 3.1.6 July 22, 2009
BUG: Issue#98 - Missing file in quickstart demo (Chrisotphe)
BUG: Issue#105 - Enabling/disabling TFileUpload on TPanel (Carl)
diff --git a/UPGRADE b/UPGRADE
index eb6adbe7..f22db112 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
- Upgrading Instructions for PRADO Framework v3.1.6
+ Upgrading Instructions for PRADO Framework v3.1.7
=================================================
!!!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.6
+---------------------
+
Upgrading from v3.1.5
---------------------
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 2d45f17a..70fc63ad 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,7 +52,7 @@
%----------------- TITLE --------------
-\title{\Huge \bfseries PRADO v3.1.6 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.1.7 Quickstart Tutorial
\thanks{Copyright 2004-2009. All Rights Reserved.}
}
\author{Qiang Xue and Wei Zhuo}
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 872afe75..28966634 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -71,7 +71,7 @@ class PradoBase
*/
public static function getVersion()
{
- return '3.1.6';
+ return '3.1.7-dev';
}
/**
diff --git a/index.html b/index.html
index 03ffeab2..c9fb24e7 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
<body>
<h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.1.6, July 22, 2009<br>
+<p>Version 3.1.7-dev, July 22, 2009<br>
Copyright&copy; 2004-2009 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
All Rights Reserved.
</p>