[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5961-g41bc587

[Marc Delisle]

The branch, master has been updated
       via  41bc587ed4494d21e7b69647a1235d2ca405c8ea (commit)
       via  e43fe5a8f100c772602aae71da9c529a542db493 (commit)
      from  6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 (commit)


- Log -----------------------------------------------------------------
commit 41bc587ed4494d21e7b69647a1235d2ca405c8ea
Merge: 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 e43fe5a8f100c772602aae71da9c529a542db493
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jul 26 12:29:48 2010 -0400

    Merge branch 'QA_3_3'

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

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

diff --git a/ChangeLog b/ChangeLog
index b75e9c8..6fd14f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,7 +103,7 @@ $Id$
 - bug #3031705 [core] Fix generating condition for real numbers by comparing
   them to string.
 
-3.3.5.0 (not yet released)
+3.3.5.0 (2010-07-26)
 - patch #2932113 [information_schema] Slow export when having lots of
   databases, thanks to Stéphane Pontier - shadow_walker
 - bug #3022705 [import] Import button does not work in Catalan when there


hooks/post-receive
-- 
phpMyAdmin