May 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2103-g435a470
by Marc Delisle 01 May '10

01 May '10

The branch, master has been updated via 435a4704450deec7eada39c7446092ad5f8d734a (commit) from 34d51adab71b6edf3b4c8b758699643f4b69149c (commit) - Log ----------------------------------------------------------------- commit 435a4704450deec7eada39c7446092ad5f8d734a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:21:33 2010 -0400 3.3.4.0-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7bc8ec..3a522c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,8 @@ $Id$ + [doc] Incorporate synchronisation docs into main document. + [core] Include Content Security Policy HTTP headers. +3.3.4.0 (not yet released) + 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-31-gf57a5cf
by Marc Delisle 01 May '10

01 May '10

The branch, QA_3_3 has been updated via f57a5cfdf91262e63f2e8a9649412d6fec2dbf54 (commit) from 6b5edbe6db695f364477cf16b907bcd6cedc03f9 (commit) - Log ----------------------------------------------------------------- commit f57a5cfdf91262e63f2e8a9649412d6fec2dbf54 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:20:38 2010 -0400 3.3.4.0-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..cb8090f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.4.0 (not yet released) + 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-30-g6b5edbe
by Marc Delisle 01 May '10

01 May '10

The branch, QA_3_3 has been updated via 6b5edbe6db695f364477cf16b907bcd6cedc03f9 (commit) from 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) - Log ----------------------------------------------------------------- commit 6b5edbe6db695f364477cf16b907bcd6cedc03f9 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:19:30 2010 -0400 3.3.4-dev ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation.html b/Documentation.html index c72c690..93d7eed 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.3-dev - Documentation</title> + <title>phpMyAdmin 3.3.4-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.3-dev + 3.3.4-dev Documentation </h1> </div> diff --git a/README b/README index 19c8a90..f9a6e36 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.3-dev + Version 3.3.4-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 57d4964..820cdc8 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.3-dev'); + $this->set('PMA_VERSION', '3.3.4-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index fbbe5f9..bb55c5e 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.3-dev - Official translators</title> + <title>phpMyAdmin 3.3.4-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.3-dev + 3.3.4-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_3, created. RELEASE_3_3_2-30-g5f8c1f9
by Marc Delisle 01 May '10

01 May '10

The branch, MAINT_3_3_3 has been created at 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) - Log ----------------------------------------------------------------- commit 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:14:18 2010 -0400 3.3.3-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0