Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f604be8bd23fd9587500278c3ed199f351ce530b https://github.com/phpmyadmin/phpmyadmin/commit/f604be8bd23fd9587500278c3ed1... Author: slimtim tim.j.mclaughlin@gmail.com Date: 2013-11-20 (Wed, 20 Nov 2013)

Changed paths: M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- When importing a SQL file convert carriage return (\r) line-endings to line feeds (\n) otherwise all queries in the file may not get executed on some platforms (e.g. Linux)

Commit: ca053deb24ad550f696a4fd2f06fb92fe003fb74 https://github.com/phpmyadmin/phpmyadmin/commit/ca053deb24ad550f696a4fd2f06f... Author: Marc Delisle marc@infomarc.info Date: 2013-11-21 (Thu, 21 Nov 2013)

Changed paths: M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- Merge pull request #765 from slimtim/bug_4153

When importing a SQL file convert \r line-endings to \n

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/088b0f7818f2...ca053deb24ad