Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5fab2fa57bf8e3a4d271396a06f5e04df82ca8e0 https://github.com/phpmyadmin/phpmyadmin/commit/5fab2fa57bf8e3a4d271396a06f5... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-14 (Tue, 14 Aug 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getRowInfoForSpecialLinks function in PMA_DisplayResults class

Commit: 93919a95a50db51ac6f2eb199d02ab30345ef1d6 https://github.com/phpmyadmin/phpmyadmin/commit/93919a95a50db51ac6f2eb199d02... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-14 (Tue, 14 Aug 2012)

Changed paths: M db_structure.php M js/db_structure.js M libraries/CommonFunctions.class.php R libraries/db_structure.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportSql.class.php A libraries/structure.lib.php M po/th.po M po/zh_CN.po M setup/styles.css M tbl_structure.php M test/classes/PMA_Error_Handler_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/common/PMA_quoting_slashing_test.php A test/libraries/php-gettext/PMA_FileReader_test.php A test/libraries/php-gettext/PMA_StreamReader_test.php A test/libraries/php-gettext/PMA_StringReader_test.php A test/libraries/php-gettext/PMA_gettext_test.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 9ca20e3838aa8938fa3929f7b6992aa137987b0d https://github.com/phpmyadmin/phpmyadmin/commit/9ca20e3838aa8938fa3929f7b699... Author: Michal Čihař mcihar@suse.cz Date: 2012-08-15 (Wed, 15 Aug 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Merge remote-tracking branch 'chanaka/master'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a539b7129f0f...9ca20e3838aa