| commit | 723a71c0145f4ccb91db23f878fefa203ce71ca6 | |
| author | lorilee <leelorik@gmail.com> | |
| Sat, 24 Jul 2010 03:43:35 +0000 (23 20:43 -0700) | ||
| committer | lorilee <leelorik@gmail.com> | |
| Sat, 24 Jul 2010 03:43:35 +0000 (23 20:43 -0700) | ||
| tree | 7e1e02c4a8d207354d30a628210afd02465db33b | treesnapshot (tar.gz zip) |
| parent | d229f6ca24868afbcbbf796d9b93a7ee30d4bae7 | commitdiff |
| parent | aec1adb0e077f2a9521bfa9ed367e9d5b6911042 | commitdiff |
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
Conflicts:
libraries/export/latex.php
themes/darkblue_orange/css/theme_right.css.php
themes/original/css/theme_right.css.php