[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-170-g9ac8148

[Marc Delisle]

The branch, master has been updated
       via  9ac8148754707d9c1533d21fada8ad183dd79f42 (commit)
       via  dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1 (commit)
      from  53e11786b4284130308e46b0bf792a95375bbd87 (commit)


- Log -----------------------------------------------------------------
commit 9ac8148754707d9c1533d21fada8ad183dd79f42
Merge: 53e11786b4284130308e46b0bf792a95375bbd87 dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun May 15 12:37:52 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index 20c2694..53390ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 
 3.4.1.0 (not yet released)
 - bug #3301108 [interface] Synchronize and already configured host
+- Bug #3302457 Inline edit and $cfg['PropertiesIconic']
 
 3.4.0.0 (2011-05-11)
 + rfe #2890226 [view] Enable VIEW rename 


hooks/post-receive
-- 
phpMyAdmin