The branch, QA_3_3 has been updated via abbbd192bfd054545d53600bcbc06be3bce7fbf1 (commit) from 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit)
- Log ----------------------------------------------------------------- commit abbbd192bfd054545d53600bcbc06be3bce7fbf1 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 22 12:29:09 2010 -0500
3.3.10-dev
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 988feaf..450f59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $
+3.3.10.0 (not yet released) + 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/Documentation.html b/Documentation.html index fb2c226..a80487a 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.9-dev - Documentation</title> + <title>phpMyAdmin 3.3.10-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.9-dev + 3.3.10-dev Documentation </h1> </div> diff --git a/README b/README index 334d3dd..7849d82 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.3.9-dev - ----------------- + Version 3.3.10-dev + ------------------ 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 ba4aeb8..8e3ff8b 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.9-dev'); + $this->set('PMA_VERSION', '3.3.10-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index bf2e2da..f47cdab 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.9-dev - Official translators</title> + <title>phpMyAdmin 3.3.10-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.9-dev + 3.3.10-dev official translators list </h1> </div>
hooks/post-receive