Public Git Hosting - phpmyadmin/crack.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a28beb9 ba395f5)

commit	f36b2e54414baa52b19a591d47b070edca036160
author	Piotr Przybylski <piotrprz@gmail.com>
	Thu, 21 Jul 2011 14:21:16 +0000 (21 16:21 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Thu, 21 Jul 2011 14:21:16 +0000 (21 16:21 +0200)
tree	0aa7a7ee291650ecef42780dee86ac3aa2f1f13b	tree \| snapshot (tar.gz zip)
parent	a28beb9c1fb4c0bb432961034b90232b24b908f3	commit \| diff
parent	ba395f545e459da2548593876308989d7f4adb05	commit \| diff

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

Conflicts:
libraries/db_links.inc.php
libraries/server_links.inc.php
tbl_structure.php
themes/pmahomme/css/theme_right.css.php

15 files changed:

db_operations.php	diff1 \|	diff2 \|	blob \| history
db_structure.php	diff1 \|	diff2 \|	blob \| history
import.php	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/db_links.inc.php	diff1 \|	diff2 \|	blob \| history
libraries/display_tbl.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/User_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/server_links.inc.php	diff1 \|	diff2 \|	blob \| history
navigation.php	diff1 \|	diff2 \|	blob \| history
server_databases.php	diff1 \|	diff2 \|	blob \| history
server_status.php	diff1 \|	diff2 \|	blob \| history
sql.php	diff1 \|	diff2 \|	blob \| history
tbl_structure.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