22 Nov
2010
22 Nov
'10
9:23 p.m.
The branch, master has been updated
via 9c8514fb97dca0a02293344847e47927e0002463 (commit)
from 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit)
- Log -----------------------------------------------------------------
commit 9c8514fb97dca0a02293344847e47927e0002463
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon Nov 22 13:23:08 2010 -0500
3.5.0-dev
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
Documentation.html | 4 ++--
README | 2 +-
libraries/Config.class.php | 2 +-
translators.html | 4 ++--
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a10389..f79ed3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
+3.5.0.0 (not yet released)
+
3.4.0.0 (not yet released)
+ rfe #2890226 [view] Enable VIEW rename
+ rfe #838637 [privileges] Export a user's privileges
diff --git a/Documentation.html b/Documentation.html
index f6235e7..3479ad2 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.0-dev - Documentation</title>
+ <title>phpMyAdmin 3.5.0-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-dev
+ 3.5.0-dev
Documentation
</h1>
</div>
diff --git a/README b/README
index 7b92968..fccd68b 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
-Version 3.4.0-dev
+Version 3.5.0-dev
-----------------
http://www.phpmyadmin.net/
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 16fe5a1..4c2f281 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.0-dev');
+ $this->set('PMA_VERSION', '3.5.0-dev');
/**
* @deprecated
*/
diff --git a/translators.html b/translators.html
index 537824c..c2ba840 100644
--- a/translators.html
+++ b/translators.html
@@ -10,7 +10,7 @@
<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-dev - Official translators</title>
+ <title>phpMyAdmin 3.5.0-dev - Official translators</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -18,7 +18,7 @@
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span
class="myadmin">MyAdmin</span></a>
- 3.4.0-dev
+ 3.5.0-dev
official translators list
</h1>
</div>
hooks/post-receive
--
phpMyAdmin