The branch, master has been updated via 04d2a605dd2473be5c060faadb08916a3b4ca648 (commit) via 06bfdd7ca6d76335f45d53134770979d7d25d739 (commit) from c968408de7b5353832c428cc85901080ed7394f8 (commit) - Log ----------------------------------------------------------------- commit 04d2a605dd2473be5c060faadb08916a3b4ca648 Merge: c968408de7b5353832c428cc85901080ed7394f8 06bfdd7ca6d76335f45d53134770979d7d25d739 Author: Michal Čihař <mcihar@suse.cz> Date: Fri Jul 22 15:53:58 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24167bd..38ac1e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,8 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374374 [interface] Fix footnote for inexact count while browsing +- bug #3372807 [interface] Fix security warning link in setup - bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) hooks/post-receive -- phpMyAdmin