The branch, master has been updated via 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba (commit) via 78fdc7d3f4079dfe98cb648deb503557b0d7c62a (commit) via e466dec53b4fca185e03d0a66b434f491355c274 (commit) via c17add38ed40312f934451e1d1cf1f0b0ef8240e (commit) from 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 (commit)

- Log ----------------------------------------------------------------- commit 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Merge: 78fdc7d3f4079dfe98cb648deb503557b0d7c62a e466dec53b4fca185e03d0a66b434f491355c274 Author: Michal Čihař mcihar@suse.cz Date: Tue Aug 2 16:22:04 2011 +0200

Merge remote-tracking branch 'origin/QA_3_4'

commit 78fdc7d3f4079dfe98cb648deb503557b0d7c62a Merge: 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 c17add38ed40312f934451e1d1cf1f0b0ef8240e Author: Michal Čihař mcihar@suse.cz Date: Tue Aug 2 16:21:56 2011 +0200

Merge commit 'c17add38ed40312f934451e1d1cf1f0b0ef8240e'

Conflicts: js/sql.js

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

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

diff --git a/ChangeLog b/ChangeLog index 319658a..151e85f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced +- bug #3374802 [interface] Comment on a column breaks inline editing

3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes

hooks/post-receive