The branch, master has been updated via 2ff7b4cc93eb88325b2ac2930b966208642c1111 (commit) via 0baec64a647642ca21e110b40e21b9dfabfdd32b (commit) via b939d1048ec3bebf066bcccafbcd3d2998db3521 (commit) from a1da3096a19c78db7e34125f6e0966654bcb4aa0 (commit) - Log ----------------------------------------------------------------- commit 2ff7b4cc93eb88325b2ac2930b966208642c1111 Author: Marc Delisle <marc@infomarc.info> Date: Mon Oct 3 12:42:35 2011 -0400 Fix merge conflicts commit 0baec64a647642ca21e110b40e21b9dfabfdd32b Merge: a1da309 b939d10 Author: Marc Delisle <marc@infomarc.info> Date: Mon Oct 3 12:41:32 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 016cbaf..9248689 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,8 @@ phpMyAdmin - ChangeLog + Support Drizzle database - bug #3356456 [interface] Interface problems for queries having LIMIT clauses +3.4.7.0 (not yet released) + 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error hooks/post-receive -- phpMyAdmin