Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: afb393816dd2fcc8b1ddb402d644d8cbafe6e157 https://github.com/phpmyadmin/phpmyadmin/commit/afb393816dd2fcc8b1ddb402d644... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-08 (Sun, 08 Sep 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- bug #4080 Overwrite existing file not obeyed Commit: 97b44acfccc6d6ba40b75a393d616bd912860ae1 https://github.com/phpmyadmin/phpmyadmin/commit/97b44acfccc6d6ba40b75a393d61... Author: João Rodrigues <diogo2pt@gmail.com> Date: 2013-09-08 (Sun, 08 Sep 2013) Changed paths: M po/pt.po Log Message: ----------- Translated using Weblate (Portuguese) Currently translated at 51.9% (1354 of 2609) Commit: 5e0a314d70438559aa46bf4607b85d3ec706bf02 https://github.com/phpmyadmin/phpmyadmin/commit/5e0a314d70438559aa46bf4607b8... Author: Weblate <noreply@weblate.org> Date: 2013-09-08 (Sun, 08 Sep 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: b211ad69db54315fd961157ea02610bfc75cf2d0 https://github.com/phpmyadmin/phpmyadmin/commit/b211ad69db54315fd961157ea026... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-08 (Sun, 08 Sep 2013) Log Message: ----------- Merge commit 'afb3938' Commit: 193f06b0afb88885409b21a8288a73e4414ac687 https://github.com/phpmyadmin/phpmyadmin/commit/193f06b0afb88885409b21a8288a... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-08 (Sun, 08 Sep 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- Fix merge conflicts Commit: 6d1faa7300204804edaf022ca5e1f66972d93e62 https://github.com/phpmyadmin/phpmyadmin/commit/6d1faa7300204804edaf022ca5e1... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-08 (Sun, 08 Sep 2013) Log Message: ----------- Merge commit '5e0a314' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5e7059725168...6d1faa730020