Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: db6ec589073f6f52524ca89b290177b6080e4e9c https://github.com/phpmyadmin/phpmyadmin/commit/db6ec589073f6f52524ca89b2901... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Changed paths: M ChangeLog M libraries/structure.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php Log Message: ----------- bug #4372 Changing browser transformation results in unnecessary table rebuild Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 8ef6a0fac0f37a89c7589cf1cda1f1426945c163 https://github.com/phpmyadmin/phpmyadmin/commit/8ef6a0fac0f37a89c7589cf1cda1... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php M po/ia.po M po/ko.po M po/ta.po M themes/pmahomme/css/common.css.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 75b3820eac9fa3265be4485c51b8d4fbb222b459 https://github.com/phpmyadmin/phpmyadmin/commit/75b3820eac9fa3265be4485c51b8... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Changed paths: M ChangeLog M libraries/structure.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 7250087692e8bd176380f6456084db69cd4487d8 https://github.com/phpmyadmin/phpmyadmin/commit/7250087692e8bd176380f6456084... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Log Message: ----------- Merge commit '8ef6a0f' Commit: f310833cb4dab95fccead0e0d6ec0428d555ad3f https://github.com/phpmyadmin/phpmyadmin/commit/f310833cb4dab95fccead0e0d6ec... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Changed paths: M libraries/structure.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 9899ac3e9322d2763ef8213dc282b56d9972707c https://github.com/phpmyadmin/phpmyadmin/commit/9899ac3e9322d2763ef8213dc282... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-21 (Mon, 21 Apr 2014) Changed paths: M libraries/structure.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e0c64783a32a...9899ac3e9322