[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ccca28: rfe #947 Show edit/delete also when there is calc...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ccca280ea6281a932f42c888c34c0637288ac306
      https://github.com/phpmyadmin/phpmyadmin/commit/ccca280ea6281a932f42c888c34c0637288ac306
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  rfe #947  Show edit/delete also when there is calculated column

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


  Commit: 0a89ee137f39276752a7a35780af9548bc001556
      https://github.com/phpmyadmin/phpmyadmin/commit/0a89ee137f39276752a7a35780af9548bc001556
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M libraries/operations.lib.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f0d4454cf0cf...0a89ee137f39