Public Git Hosting - phpmyadmin.git/commit

commit	7f1fa1bab02e9b584a358b21fdc121de35a43810
author	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 5 Aug 2011 15:17:47 +0000 (5 17:17 +0200)
committer	Piotr Przybylski <piotrprz@gmail.com>
	Fri, 5 Aug 2011 15:17:47 +0000 (5 17:17 +0200)
tree	509183ba7113fcbb3512ad9a7866fece671ed639	tree \| snapshot (tar.gz zip)
parent	ca8a30f7f8406b789489da3997162d0beaa75dba	commit \| diff
parent	efa788d00d4ab546f7ec1b24522087c9cbc13743	commit \| diff

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

Conflicts:
js/server_status.js
libraries/database_interface.lib.php
libraries/mysql_charsets.lib.php

22 files changed:

db_qbe.php	diff1 \|	diff2 \|	blob \| history
js/server_status.js	diff1 \|	diff2 \|	blob \| history
libraries/blobstreaming.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/build_html_for_db.lib.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/htmlword.php	diff1 \|	diff2 \|	blob \| history
libraries/export/odt.php	diff1 \|	diff2 \|	blob \| history
libraries/export/sql.php	diff1 \|	diff2 \|	blob \| history
libraries/export/texytext.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/relation.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/Pdf_Relation_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/server_synchronize.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/tbl_properties.inc.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

phpMyAdmin

RSS Atom

db_qbe.php	diff1 \|	diff2 \|	blob \| history
js/server_status.js	diff1 \|	diff2 \|	blob \| history
libraries/blobstreaming.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/build_html_for_db.lib.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/htmlword.php	diff1 \|	diff2 \|	blob \| history
libraries/export/odt.php	diff1 \|	diff2 \|	blob \| history
libraries/export/sql.php	diff1 \|	diff2 \|	blob \| history
libraries/export/texytext.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/relation.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/schema/Pdf_Relation_Schema.class.php	diff1 \|	diff2 \|	blob \| history
libraries/server_synchronize.lib.php	diff1 \|	diff2 \|	blob \| history
libraries/tbl_properties.inc.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