nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgotten conflict resolving after merge.

Browse Source
This commit is contained in:
Michal Čihař
2010-03-11 14:00:01 +01:00
parent d659f3ba2b
commit 4ac7e46605
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -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 #869006 [structure] Ignore number of records for MRG_MyISAM tables
- bug [browse] "Show BLOB contents" should display HTML code that is present - bug [browse] "Show BLOB contents" should display HTML code that is present
in a BLOB, thanks to Vincent van der Tuin in a BLOB, thanks to Vincent van der Tuin
<<<<<<< HEAD
- [privileges] Improve escaping of hostname - [privileges] Improve escaping of hostname
=======
- [privileges] Improve Proper escaping of hostname
>>>>>>> origin/MAINT_3_3_0
3.2.4.0 (2009-12-02) 3.2.4.0 (2009-12-02)
- bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status