The branch, QA_3_3 has been updated
via 12edc03e2f1953bdfdecc7eaaec760e6821b4286 (commit)
from b95666b22d2cb0a1119341bfc64d28cd77f5be28 (commit)
- Log -----------------------------------------------------------------
commit 12edc03e2f1953bdfdecc7eaaec760e6821b4286
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Jun 20 06:25:07 2010 -0400
3.3.5-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 1045fee..d259bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $
+3.3.5.0 (not yet released)
+
3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value
- bug #2998889 [import] Import button does not work in Catalan
diff --git a/Documentation.html b/Documentation.html
index 8aaa009..6dff5d4 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,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.3.4-rc1 - Documentation</title>
+ <title>phpMyAdmin 3.3.5-dev - Documentation</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -18,7 +18,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.3.4-rc1
+ 3.3.5-dev
Documentation
</h1>
</div>
diff --git a/README b/README
index 9973a5d..2df920b 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.3.4-rc1
+ Version 3.3.5-dev
-----------------
http://www.phpmyadmin.net/
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e17ecea..72b41f7 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.3.4-rc1');
+ $this->set('PMA_VERSION', '3.3.5-dev');
/**
* @deprecated
*/
diff --git a/translators.html b/translators.html
index 66a8d9f..ec250a8 100644
--- a/translators.html
+++ b/translators.html
@@ -11,7 +11,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.3.4-rc1 - Official translators</title>
+ <title>phpMyAdmin 3.3.5-dev - Official translators</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -19,7 +19,7 @@
<div id="header">
<h1>
<a
href="http://www.phpmyadmin.net/">php<span
class="myadmin">MyAdmin</span></a>
- 3.3.4-rc1
+ 3.3.5-dev
official translators list
</h1>
</div>
hooks/post-receive
--
phpMyAdmin