Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne
2011-03-12 18:54:07 +05:30
3 changed files with 4 additions and 4 deletions

View File

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.4.0-beta4 - Documentation</title>
<title>phpMyAdmin 3.4.0-rc1-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.4.0-beta4
3.4.0-rc1-dev
Documentation
</h1>
</div>

2
README
View File

@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
Version 3.4.0-beta4
Version 3.4.0-rc1-dev
A set of PHP-scripts to manage MySQL over the web.

View File

@@ -96,7 +96,7 @@ class PMA_Config
*/
function checkSystem()
{
$this->set('PMA_VERSION', '3.4.0-beta4');
$this->set('PMA_VERSION', '3.4.0-rc1-dev');
/**
* @deprecated
*/