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

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

Browse Source
This commit is contained in:
Herman van Rink
2011-04-27 09:42:58 +02:00
parent b3f0c8f7ed fc4f088086
commit d45e09b3c6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

2
README
View File

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

2
libraries/Config.class.php
View File

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

2
main.php
View File

@@ -351,7 +351,7 @@ if (file_exists('./libraries/language_stats.inc.php')) {
* speaking users. * speaking users.
*/ */
if (isset($GLOBALS['language_stats'][$lang]) && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']) { if (isset($GLOBALS['language_stats'][$lang]) && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']) {
trigger_error('You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate">contributing</a>.', E_USER_NOTICE); trigger_error('You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate" target="_blank">contributing</a>.', E_USER_NOTICE);
} }
} }