Merge remote-tracking branch 'origin/master' into drizzle
commit3586bb992f0e6c325207dc55bd01c1f3607f0b31
authorPiotr Przybylski <piotrprz@gmail.com>
Fri, 22 Jul 2011 09:07:04 +0000 (22 11:07 +0200)
committerPiotr Przybylski <piotrprz@gmail.com>
Fri, 22 Jul 2011 09:07:04 +0000 (22 11:07 +0200)
tree8152d54c4ae7e92c342bf1f5e2126fee22ecdbdb
parent74a00a110f6d15d24b5b40c02ec8a3916a6acd15
parentd8f6e7da389da4ff99435dea358b713af116f9e1
Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
db_structure.php
libraries/database_interface.lib.php
libraries/server_synchronize.lib.php
server_status.php
sql.php
45 files changed:
Documentation.html
db_create.php
db_datadict.php
db_operations.php
db_qbe.php
db_search.php
db_structure.php
js/server_status.js
libraries/Index.class.php
libraries/List.class.php
libraries/List_Database.class.php
libraries/StorageEngine.class.php
libraries/Table.class.php
libraries/Tracker.class.php
libraries/common.inc.php
libraries/common.lib.php
libraries/database_interface.lib.php
libraries/db_common.inc.php
libraries/db_info.inc.php
libraries/db_links.inc.php
libraries/display_tbl.lib.php
libraries/export/htmlword.php
libraries/export/latex.php
libraries/export/odt.php
libraries/export/sql.php
libraries/export/texytext.php
libraries/export/xml.php
libraries/import.lib.php
libraries/mysql_charsets.lib.php
libraries/relation.lib.php
libraries/server_links.inc.php
libraries/server_synchronize.lib.php
main.php
navigation.php
pmd_common.php
server_databases.php
server_privileges.php
server_status.php
sql.php
tbl_alter.php
tbl_operations.php
tbl_printview.php
tbl_structure.php
themes/pmahomme/css/theme_right.css.php
transformation_wrapper.php