Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2012-07-07 17:09:51 +0400
committerMarc Delisle <marc@infomarc.info>2012-07-07 17:09:51 +0400
commitc03538c1ed551033cec474e8176797dbecc946af (patch)
tree4fc404eec6fabdf1601ba82fff6e8c6a0764e9fd
parent9126f2cc2d3fd437398f2a30038940bf028bae77 (diff)
3.5.2 releaseRELEASE_3_5_2
-rw-r--r--ChangeLog2
-rw-r--r--Documentation.html4
-rw-r--r--README2
-rw-r--r--libraries/Config.class.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cc62eb36ad..9f0581e090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-3.5.2.0 (not yet released)
+3.5.2.0 (2012-07-07)
- bug #3521416 [interface] JS error when editing index
- bug #3521313 [core] Call to undefined function __()
- bug #3521016 [edit] NOW() function incorrectly selected
diff --git a/Documentation.html b/Documentation.html
index 883633e09e..b2d63dd03f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -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.5.2-rc1 - Documentation</title>
+ <title>phpMyAdmin 3.5.2 - 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.5.2-rc1
+ 3.5.2
Documentation
</h1>
</div>
diff --git a/README b/README
index d5ac5fba3b..64abf10474 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.5.2-rc1
+Version 3.5.2
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 25b34c6d25..dd37bb241f 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -98,7 +98,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.5.2-rc1');
+ $this->set('PMA_VERSION', '3.5.2');
/**
* @deprecated
*/