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

fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-11-26 09:07:19 -05:00
parent f805097b86
commit b1103e2db9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -14,6 +14,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #3117535 [replication] Add quotes to database in initial statement, - patch #3117535 [replication] Add quotes to database in initial statement,
thanks to Craig Duncan - duncan3dc thanks to Craig Duncan - duncan3dc
3.3.8.1 (2010-10-26)
- bug #3115519 (private) [security] XSS on db search
3.3.8.0 (2010-10-25) 3.3.8.0 (2010-10-25)
- bug #3059311 [import] BIGINT field type added to table analysis - bug #3059311 [import] BIGINT field type added to table analysis
- [core] Update library PHPExcel to version 1.7.4 - [core] Update library PHPExcel to version 1.7.4
@@ -27,9 +30,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
3.3.7.0 (2010-09-07) 3.3.7.0 (2010-09-07)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
a page size increase, thanks to Martin Schönberger - mad05 a page size increase, thanks to Martin Schönberger - mad05
- bug #3054458 [core] Fixed displaying number of rows.
- bug #3035300 [parser] Fixed wrong definition of keywords.
- [setup] Fixed escaping of server name.
3.3.6.0 (2010-08-28) 3.3.6.0 (2010-08-28)
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name