The branch, QA_3_4 has been updated
via a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit)
from ec99ab3e0084e61623f5343dc82296cc0cd5fe3b (commit)
- Log -----------------------------------------------------------------
commit a3132f6e91f04dc8f885f4141e6d397460421fa4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Oct 19 16:58:10 2011 -0400
3.4.8-dev
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
Documentation.html | 4 ++--
README | 2 +-
libraries/Config.class.php | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 04455a7..2660fd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
+3.4.8.0 (not yet released)
+
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] =
false
- bug #3418849 [interface] Inline edit shows dropdowns even after closing
diff --git a/Documentation.html b/Documentation.html
index e9390dd..c925464 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.4.7-dev - Documentation</title>
+ <title>phpMyAdmin 3.4.8-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.7-dev
+ 3.4.8-dev
Documentation
</h1>
</div>
diff --git a/README b/README
index caec19f..aecad4c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.4.7-dev
+Version 3.4.8-dev
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a6f4e12..ed9d775 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.7-dev');
+ $this->set('PMA_VERSION', '3.4.8-dev');
/**
* @deprecated
*/
hooks/post-receive
--
phpMyAdmin