Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 571d89f0b87ff2fb5b5a32617c131a2b6fde7800 https://github.com/phpmyadmin/phpmyadmin/commit/571d89f0b87ff2fb5b5a32617c13... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-03-17 (Mon, 17 Mar 2014)

Changed paths: M js/messages.php M js/tbl_change.js

Log Message: ----------- Feature request: #1514 Add function to all the insert boxes automatically.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

Commit: f4500d9d1040a833299540d41d601ab0f194375a https://github.com/phpmyadmin/phpmyadmin/commit/f4500d9d1040a833299540d41d60... Author: Marc Delisle marc@infomarc.info Date: 2014-03-17 (Mon, 17 Mar 2014)

Changed paths: M js/messages.php M js/tbl_change.js

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2fb92245bf3f...f4500d9d1040