| commit | b8cee3086bb34bc231b62c6884bb3192c2046595 | |
| author | Crack <piotrprz@gmail.com> | |
| Thu, 19 Aug 2010 12:45:18 +0000 (19 14:45 +0200) | ||
| committer | Crack <piotrprz@gmail.com> | |
| Thu, 19 Aug 2010 12:45:18 +0000 (19 14:45 +0200) | ||
| tree | 77906522f35977d6d4972528ccc8f7be612cb43d | treesnapshot (tar.gz zip) |
| parent | 98cbab04113cac9de1aa8aea07dd92d8ae7f03b7 | commitdiff |
| parent | 772d80787ddead09cb5f00a45738ef48693ba5b4 | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
js/functions.js
js/tooltip.js
libraries/config.default.php
libraries/config.values.php
libraries/display_export.lib.php
setup/lib/forms.inc.php
setup/lib/messages.inc.php
themes/darkblue_orange/css/theme_right.css.php
themes/original/css/theme_right.css.php
Conflicts:
js/functions.js
js/tooltip.js
libraries/config.default.php
libraries/config.values.php
libraries/display_export.lib.php
setup/lib/forms.inc.php
setup/lib/messages.inc.php
themes/darkblue_orange/css/theme_right.css.php
themes/original/css/theme_right.css.php
14 files changed: