[Phpmyadmin-git] [phpmyadmin/phpmyadmin] db6ec5: bug #4372 Changing browser transformation results ... - Git

21 Apr 2014


      Branch: refs/heads/QA_4_1
  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
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/54febec2e51a...8ef6a0fac0f3