From 39cf99ba26554af56788ea49257104f112f35cd8 Mon Sep 17 00:00:00 2001 From: "qiang.xue" Date: Sun, 2 May 2010 02:18:39 +0000 Subject: [PATCH] prepare for next release. --- CHANGELOG | 3 +++ UPGRADE | 5 ++++- framework/YiiBase.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2e1412fb2..82d8cad78 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Yii Framework Change Log ======================== +Version 1.1.3 to be released +---------------------------- + Version 1.1.2 May 2, 2010 ------------------------- - Bug #676, 891: merging criterias with parameters is impossible (Sam Dark) diff --git a/UPGRADE b/UPGRADE index a3fbcbf44..e49e25ea1 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,5 +1,5 @@ - Upgrading Instructions for Yii Framework v1.1.2 + Upgrading Instructions for Yii Framework v1.1.3 =============================================== !!!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 v1.1.2 +--------------------- + Upgrading from v1.1.1 --------------------- diff --git a/framework/YiiBase.php b/framework/YiiBase.php index a200cca49..dd3dc7fa4 100644 --- a/framework/YiiBase.php +++ b/framework/YiiBase.php @@ -68,7 +68,7 @@ class YiiBase */ public static function getVersion() { - return '1.1.2'; + return '1.1.3-dev'; } /**