The branch, MAINT_2_11_11 has been updated via e6aeaf1925be0804e068d50b8c193d8b13f80ced (commit) from 0e4369a8d2e4dbd1f3e0493b75b4f85eb1f0f908 (commit)

- Log ----------------------------------------------------------------- commit e6aeaf1925be0804e068d50b8c193d8b13f80ced Author: Marc Delisle marc@infomarc.info Date: Tue Sep 7 12:16:12 2010 -0400

2.11.11 release

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 4307e13..ff8b9dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $

-2.11.11.0 (not yet released) +2.11.11.0 (2010-09-07) - [core] Fix broken cleanup of $_GET - bug #3054458 [core] Fixed displaying number of rows.

diff --git a/Documentation.html b/Documentation.html index ef17724..5513e18 100644 --- a/Documentation.html +++ b/Documentation.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=iso-8859-1" /> - <title>phpMyAdmin 2.11.11-rc1 - Documentation</title> + <title>phpMyAdmin 2.11.11 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -33,7 +33,7 @@ <li><a href="#glossary">Glossary</a></li> </ul>

-<h1>phpMyAdmin 2.11.11-rc1 Documentation</h1> +<h1>phpMyAdmin 2.11.11 Documentation</h1>

<ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> diff --git a/README b/README index 2619647..375317e 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme

A set of PHP-scripts to manage MySQL over the web.

- Version 2.11.11-rc1 - ------------------- + Version 2.11.11 + --------------- http://www.phpmyadmin.net/

Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a03a00c..a2cf481 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -85,7 +85,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.11.11-rc1'); + $this->set('PMA_VERSION', '2.11.11'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 9868610..88148b9 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,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=iso-8859-1" /> - <title>phpMyAdmin 2.11.11-rc1 - Official translators</title> + <title>phpMyAdmin 2.11.11 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -31,7 +31,7 @@ <li><a href="Documentation.html#glossary">Glossary</a></li> </ul>

-<h1>phpMyAdmin 2.11.11-rc1 official translators list</h1> +<h1>phpMyAdmin 2.11.11 official translators list</h1>

<p> Here is the list of the &quot;official translators&quot; of phpMyAdmin.</p>

hooks/post-receive