nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gettext

Browse Source
This commit is contained in:
Michal Čihař
2010-03-12 00:08:10 +01:00
parent 7bcf3879ba bbc3d3debf
commit b23e4eccbe
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
navigation.php
View File

@@ -36,7 +36,6 @@
* @uses PMA_getTableList() * @uses PMA_getTableList()
* @uses PMA_getRelationsParam() * @uses PMA_getRelationsParam()
* @uses PMA_outBufferPre() * @uses PMA_outBufferPre()
* @uses session_write_close()
* @uses strlen() * @uses strlen()
* @uses session_write_close() * @uses session_write_close()
* @uses is_array() * @uses is_array()

6
scripts/create-release.sh
View File

@@ -69,7 +69,7 @@ fi
cat <<END cat <<END
Please ensure you have: 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 - in libraries/Config.class.php PMA_Config::__constructor() the line
" \$this->set( 'PMA_VERSION', '$version' ); " " \$this->set( 'PMA_VERSION', '$version' ); "
- in Documentation.html the 2 lines - in Documentation.html the 2 lines
@@ -206,7 +206,7 @@ cat <<END
Todo now: 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: or a release candidate:
version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE 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 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, Don't forget to update the Description section in the announcement,
based on Documentation.html. 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 - in libraries/Config.class.php PMA_Config::__constructor() the line
" \$this->set( 'PMA_VERSION', '2.7.1-dev' ); " " \$this->set( 'PMA_VERSION', '2.7.1-dev' ); "
- in Documentation.html the 2 lines - in Documentation.html the 2 lines