The branch, QA_3_3 has been updated via 4ac7e466053422ae48b328b6be2aa9a17812d1dd (commit) from d659f3ba2b6dafbd818caca1f22a45455690198c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58e3122..f120b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,11 +97,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -<<<<<<< HEAD - [privileges] Improve escaping of hostname -======= -- [privileges] Improve Proper escaping of hostname ->>>>>>> origin/MAINT_3_3_0 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status hooks/post-receive -- phpMyAdmin