[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9ea916: 'same' and 'new' are the only choices here

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ea91627cf4c1059519a29ab81ab521481b86399
      https://github.com/phpmyadmin/phpmyadmin/commit/9ea91627cf4c1059519a29ab81ab521481b86399
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M db_designer.php

  Log Message:
  -----------
  'same' and 'new' are the only choices here

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 29bf47e49b7f4eabbedf0bb14ff7edbaea5a44de
      https://github.com/phpmyadmin/phpmyadmin/commit/29bf47e49b7f4eabbedf0bb14ff7edbaea5a44de
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M db_operations.php

  Log Message:
  -----------
  Define $message in all paths

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 241aa4767aad59da5f9a1ce577bca53242da311e
      https://github.com/phpmyadmin/phpmyadmin/commit/241aa4767aad59da5f9a1ce577bca53242da311e
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M db_operations.php

  Log Message:
  -----------
  Define $sql_query in all paths

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 92ca4abe59c76bd35c40afea63af614520524259
      https://github.com/phpmyadmin/phpmyadmin/commit/92ca4abe59c76bd35c40afea63af614520524259
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M js/pmd/move.js

  Log Message:
  -----------
  Fix bad line breaks

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: d274064d54210be663cd0f49fc5975faf9b67983
      https://github.com/phpmyadmin/phpmyadmin/commit/d274064d54210be663cd0f49fc5975faf9b67983
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Avoid bad line breaks

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 69cb4614548d6c23e6052d0397d2d15e4b691051
      https://github.com/phpmyadmin/phpmyadmin/commit/69cb4614548d6c23e6052d0397d2d15e4b691051
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M index.php
    M libraries/display_create_database.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M tbl_change.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mysql_charsets_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/03debd0a6eaf...69cb4614548d