Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceddfffac4099c31794d606b6e4b887f90fdffa3 https://github.com/phpmyadmin/phpmyadmin/commit/ceddfffac4099c31794d606b6e4b... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths: M libraries/display_export.lib.php M libraries/insert_edit.lib.php
Log Message: ----------- Update PHPDoc. Add return.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: c0b5648cf6d04c8d44db11bacbacffef21cfcce5 https://github.com/phpmyadmin/phpmyadmin/commit/c0b5648cf6d04c8d44db11bacbac... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths: M import.php M import_status.php M libraries/DisplayResults.class.php M libraries/Menu.class.php M libraries/ServerStatusData.class.php M libraries/Table.class.php M libraries/Theme_Manager.class.php M libraries/Types.class.php M libraries/create_addfield.lib.php M libraries/display_export.lib.php M libraries/gis/GIS_Geometry.class.php M libraries/mult_submits.inc.php M libraries/mult_submits.lib.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php M libraries/relation.lib.php M libraries/replication_gui.lib.php M libraries/server_engines.lib.php M libraries/server_privileges.lib.php M libraries/sql_query_form.lib.php M libraries/sqlparser.lib.php M libraries/structure.lib.php M libraries/tbl_columns_definition_form.lib.php M test/classes/PMA_Table_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/export/PMA_ExportCsv_test.php M test/classes/plugin/export/PMA_ExportLatex_test.php M test/classes/plugin/export/PMA_ExportTexytext_test.php M test/classes/plugin/export/PMA_ExportXml_test.php M test/classes/plugin/import/ImportLdi_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/schema/Pdf_Relation_Schema_test.php M test/libraries/PMA_ConfigFile_test.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_mult_submits_test.php M test/libraries/PMA_server_plugins_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c8e33b2a9623...c0b5648cf6d0