Merge branch 'QA_3_4'

Conflicts:
	js/sql.js
This commit is contained in:
Madhura Jayaratne 2011-10-05 20:22:47 +05:30
commit 75c4a2ed45

View File

@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
- bug #3418849 [interface] Inline edit shows dropdowns even after closing
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases