Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4711126d1232f9937ce70773639d6911db828266 https://github.com/phpmyadmin/phpmyadmin/commit/4711126d1232f9937ce70773639d... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-02 (Fri, 02 Aug 2013) Changed paths: M ChangeLog M js/tbl_structure.js Log Message: ----------- Missing hints when changing a column's structure Commit: d9fecc136df442dd5de6c9597b8317daf1e51fec https://github.com/phpmyadmin/phpmyadmin/commit/d9fecc136df442dd5de6c9597b83... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-02 (Fri, 02 Aug 2013) Changed paths: M ChangeLog M js/tbl_structure.js Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6f80e5c10e28...d9fecc136df4