lorilee
|
2ebf96d242
|
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
libraries/display_export.lib.php
libraries/display_import.lib.php
|
2010-07-20 13:04:03 -07:00 |
|
Michal Čihař
|
318dc4b650
|
Drop @version tag from docblocks.
|
2010-07-20 13:59:17 +02:00 |
|
lorilee
|
71ee3e6421
|
Fixed XHTML syntax problems
|
2010-06-18 16:12:41 -04:00 |
|
lorilee
|
30b4bc9944
|
Modified label text
|
2010-06-11 01:16:01 -04:00 |
|
Marc Delisle
|
b05a903dc3
|
gettext conversion
|
2010-05-14 07:47:50 -04:00 |
|
Marc Delisle
|
7b3c21b599
|
code cleanup
|
2009-12-29 14:04:05 +00:00 |
|
Marc Delisle
|
15441ded5d
|
do not try to display a tab that was not built
|
2009-08-22 11:22:50 +00:00 |
|