Crack b8cee3086b 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

2010-08-19 14:45:18 +02:00

..

css

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

2010-08-19 14:45:18 +02:00

img

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

2010-08-19 14:45:18 +02:00

jquery

Add jquery ui theme to themes.

2010-04-15 10:17:58 +02:00

info.inc.php

Drop @version tag from docblocks.

2010-07-20 13:59:17 +02:00

layout.inc.php

Drop @version tag from docblocks.

2010-07-20 13:59:17 +02:00

screen.png

…