The branch, gettext has been updated via b23e4eccbeddd5405fc0150c92fbbed5c47fd413 (commit) via bbc3d3debfc3ae86aaab661a536170293c7c9cf7 (commit) via 4a53eb19160936770d32244939ee82906e0f88c8 (commit) via 0db3d899eed5dd09d6e0e018e5c175c1b4d53e08 (commit) via 4876d2775855b2ce5bd9fff9e5abedbe2600a9bb (commit) from 7bcf3879baab216364ec4159f2d4d551856d1723 (commit)

- Log ----------------------------------------------------------------- commit b23e4eccbeddd5405fc0150c92fbbed5c47fd413 Merge: 7bcf3879baab216364ec4159f2d4d551856d1723 bbc3d3debfc3ae86aaab661a536170293c7c9cf7 Author: Michal Čihař michal@cihar.com Date: Fri Mar 12 00:08:10 2010 +0100

Merge branch 'master' into gettext

-----------------------------------------------------------------------

Summary of changes: navigation.php | 1 - scripts/create-release.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/navigation.php b/navigation.php index 2c7ccf7..864456e 100644 --- a/navigation.php +++ b/navigation.php @@ -36,7 +36,6 @@ * @uses PMA_getTableList() * @uses PMA_getRelationsParam() * @uses PMA_outBufferPre() - * @uses session_write_close() * @uses strlen() * @uses session_write_close() * @uses is_array() diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 0db7686..51ff185 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -69,7 +69,7 @@ fi cat <<END

Please ensure you have: - 1. incremented rc count or version in subversion : + 1. incremented rc count or version in the repository : - in libraries/Config.class.php PMA_Config::__constructor() the line " $this->set( 'PMA_VERSION', '$version' ); " - in Documentation.html the 2 lines @@ -206,7 +206,7 @@ cat <<END Todo now: ---------

- 1. tag the subversion tree with the new revision number for a plain release + 1. tag the repository with the new revision number for a plain release or a release candidate: version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING @@ -226,7 +226,7 @@ Todo now: Don't forget to update the Description section in the announcement, based on Documentation.html.

- 7. increment rc count or version in subversion : + 7. increment rc count or version in the repository : - in libraries/Config.class.php PMA_Config::__constructor() the line " $this->set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html the 2 lines

hooks/post-receive