Public Git Hosting - phpmyadmin.git/commit

commit	a7c0c55c7fa9c0ee45cef59245e2572f3c2f1be1
author	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 12 Aug 2011 20:02:40 +0000 (12 22:02 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 12 Aug 2011 20:02:40 +0000 (12 22:02 +0200)
tree	5796d8d201939016ef01bacc626f517e10f56795	tree \| snapshot (tar.gz zip)
parent	64926ead73dadd10b323712304d72fa86c6a3982	commit \| diff
parent	9147f30dc6b00dc63c998f1d2d3972d1a47e6c57	commit \| diff

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

Conflicts:
js/server_status.js
libraries/common.lib.php
tbl_printview.php
tbl_select.php
tbl_structure.php

27 files changed:

Documentation.html	diff1 \|	diff2 \|	blob \| history
db_search.php	diff1 \|	diff2 \|	blob \| history
db_structure.php	diff1 \|	diff2 \|	blob \| history
import.php	diff1 \|	diff2 \|	blob \| history
js/server_status_monitor.js	\|	diff2 \|	blob \| history
libraries/List_Database.class.php	diff1 \|	diff2 \|	blob \| history
libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/common.inc.php	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.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/htmlword.php	diff1 \|	diff2 \|	blob \| history
libraries/export/xml.php	diff1 \|	diff2 \|	blob \| history
libraries/import.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/mysql_charsets.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/Pdf_Relation_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/User_Schema.class.php	diff1 \|	diff2 \|	blob \| history
navigation.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_change.php	diff1 \|	diff2 \|	blob \| history
tbl_printview.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

phpMyAdmin

RSS Atom

Documentation.html	diff1 \|	diff2 \|	blob \| history
db_search.php	diff1 \|	diff2 \|	blob \| history
db_structure.php	diff1 \|	diff2 \|	blob \| history
import.php	diff1 \|	diff2 \|	blob \| history
js/server_status_monitor.js	\|	diff2 \|	blob \| history
libraries/List_Database.class.php	diff1 \|	diff2 \|	blob \| history
libraries/Table.class.php	diff1 \|	diff2 \|	blob \| history
libraries/common.inc.php	diff1 \|	diff2 \|	blob \| history
libraries/common.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/config.default.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/htmlword.php	diff1 \|	diff2 \|	blob \| history
libraries/export/xml.php	diff1 \|	diff2 \|	blob \| history
libraries/import.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/mysql_charsets.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/Pdf_Relation_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/User_Schema.class.php	diff1 \|	diff2 \|	blob \| history
navigation.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_change.php	diff1 \|	diff2 \|	blob \| history
tbl_printview.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