From 8b93e376ab3f11ab486f820f8b597afe3837f1ca Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 16 Apr 2011 13:04:11 -0400
Subject: [PATCH 1/3] Removed 9px height and width on plus/minus icons in
 navigation frame

---
 navigation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/navigation.php b/navigation.php
index 8776645ec..b7b960273 100644
--- a/navigation.php
+++ b/navigation.php
@@ -235,9 +235,9 @@ if (! $GLOBALS['server']) {
 //    In this case, the database should not be collapsible/expandable
 
 $img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"'
-    .' width="9" height="9" alt="+" />';
+    .' alt="+" />';
 $img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"'
-    .' width="9" height="9" alt="-" />';
+    .' alt="-" />';
 
 $href_left = '<a onclick="if (toggle(\'%d\')) return false;"'
     .' href="navigation.php?%s" target="_self">';

From c13f25d4913821eb48b7f0372a06743abb92b0b1 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 16 Apr 2011 13:10:24 -0400
Subject: [PATCH 2/3] 3.4.0-rc1

---
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 3063f3cae..8e35ab3ad 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-rc1-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.0-rc1 - 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-rc1-dev
+        3.4.0-rc1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index d848e1981..d64950da1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.0-rc1-dev
+Version 3.4.0-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e791e3135..008b274d8 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-rc1-dev');
+        $this->set('PMA_VERSION', '3.4.0-rc1');
         /**
          * @deprecated
          */

From 5381b2f600f9574ff149628316d67c40be53565d Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 16 Apr 2011 13:40:46 -0400
Subject: [PATCH 3/3] 3.4.0-rc2-dev

---
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 8e35ab3ad..887b8a0fe 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-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.0-rc2-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-rc1
+        3.4.0-rc2-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index d64950da1..3b3f355d2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.0-rc1
+Version 3.4.0-rc2-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 008b274d8..85fa390d4 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-rc1');
+        $this->set('PMA_VERSION', '3.4.0-rc2-dev');
         /**
          * @deprecated
          */