Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
This commit is contained in:
lorilee
2010-07-23 20:43:35 -07:00
99 changed files with 10036 additions and 14742 deletions

View File

@@ -1206,7 +1206,7 @@ label.desc sup {
position: absolute;
}
code.sql {
code.sql, div.sqlvalidate {
display: block;
padding: 0.3em;
margin-top: 0;

View File

@@ -1157,7 +1157,7 @@ label.desc sup {
position: absolute;
}
code.sql {
code.sql, div.sqlvalidate {
display: block;
padding: 0.3em;
margin-top: 0;