Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 82675f7 938e807)

commit	a28beb9c1fb4c0bb432961034b90232b24b908f3
author	Piotr Przybylski <piotrprz@gmail.com>
	Thu, 21 Jul 2011 13:25:52 +0000 (21 15:25 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Thu, 21 Jul 2011 13:25:52 +0000 (21 15:25 +0200)
tree	e96cdf8be8370d8763acec70677cde13ca254d4f	tree \| snapshot (tar.gz zip)
parent	82675f778dce0736ddeb5953b4fe9277a6360df2	commit \| diff
parent	938e807173a997b4ce69095d7189262cd3b8273a	commit \| diff

Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
libraries/server_synchronize.lib.php
server_status.php

15 files changed:

db_operations.php	diff1 \|	diff2 \|	blob \| history
libraries/List_Database.class.php	diff1 \|	diff2 \|	blob \| history
libraries/common.inc.php	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/database_interface.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/export/sql.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/User_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/server_synchronize.lib.php	diff1 \|	diff2 \|	blob \| history
server_privileges.php	diff1 \|	diff2 \|	blob \| history
server_status.php	diff1 \|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
tbl_operations.php	diff1 \|	diff2 \|	blob \| history
themes/original/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history
themes/pmahomme/css/theme_right.css.php	diff1 \|	diff2 \|	blob \| history

Drizzle / GSOC 2011