Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fec459c9ace38da69b90a3356309349f8a7b8237 https://github.com/phpmyadmin/phpmyadmin/commit/fec459c9ace38da69b90a3356309... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-14 (Fri, 14 Nov 2014)

Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: b38970d4ac786517e4f66abc6d2261f334f833c5 https://github.com/phpmyadmin/phpmyadmin/commit/b38970d4ac786517e4f66abc6d22... Author: Marc Delisle marc@infomarc.info Date: 2014-11-23 (Sun, 23 Nov 2014)

Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/15d7b17e8071...b38970d4ac78