[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-987-gfd1ac3c

[Marc Delisle]

The branch, master has been updated
       via  fd1ac3cdac0a302ace44c966337822d7589a129c (commit)
      from  f3a689537213ae1171d7c3b95b8f06d4a56abcf7 (commit)


- Log -----------------------------------------------------------------
commit fd1ac3cdac0a302ace44c966337822d7589a129c
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri May 6 06:13:40 2011 -0400

    3.5.0-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 5a15934..5bbab72 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 aa3df7f..cee6a42 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-rc3-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-rc3-dev
+        3.5.0-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 1504628..bbc7762 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.0-rc3-dev
+Version 3.5.0-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 04451dd..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-rc3-dev');
+        $this->set('PMA_VERSION', '3.5.0-dev');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin