[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_10RC1-4-g86cdc9f

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  86cdc9f7bb1334f47546159c2d83960ff36426a6 (commit)
       via  bec6e74bd32f848a922f88969b83a547fc9ab1bd (commit)
       via  3e31ab117262a1d36c5dd0d57d9ec823289d20f9 (commit)
       via  a80d0892f8c584aaf8e4cf3f505b178cfd82be51 (commit)
      from  0527c3ea78d869596ab90903850cbff8fbcc67fc (commit)


- Log -----------------------------------------------------------------
commit 86cdc9f7bb1334f47546159c2d83960ff36426a6
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Mar 19 07:58:11 2011 -0400

    3.3.11-dev

commit bec6e74bd32f848a922f88969b83a547fc9ab1bd
Merge: 0527c3ea78d869596ab90903850cbff8fbcc67fc 3e31ab117262a1d36c5dd0d57d9ec823289d20f9
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Mar 19 07:55:55 2011 -0400

    Merge remote branch 'origin/MAINT_3_3_10' into QA_3_3

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

Summary of changes:
 ChangeLog |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06c64ab..a3cd1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-3.3.10.0 (not yet released)
+3.3.11.0 (not yet released)
+
+3.3.10.0 (2011-03-19)
 - patch #3147400 [structure] Aria table size printed as unknown,
   thanks to erickoh75 - erickoh75
 - patch #3150164 [structure] Ordering by size gives incorrect results,


hooks/post-receive
-- 
phpMyAdmin