Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

Conflicts: libraries/display_export.lib.php
2010-07-20 15:23:12 -07:00
parent 07d68cb79f d229f6ca24
commit aa49b85fad
321 changed files with 125955 additions and 126852 deletions
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -3,7 +3,6 @@
 /**
 * navigation css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -3,7 +3,6 @@
 /**
 * print css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -3,7 +3,6 @@
 /**
 * main css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */