[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2ee989: fix mousemove conflict:bug#4549

[Smita Kumari]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2ee9898f2093bb67c6041eafa49fdfcac32221d3
      https://github.com/phpmyadmin/phpmyadmin/commit/2ee9898f2093bb67c6041eafa49fdfcac32221d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  fix mousemove conflict:bug#4549

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 127a476be2632530af3dfad8beccc823c1f3cf39
      https://github.com/phpmyadmin/phpmyadmin/commit/127a476be2632530af3dfad8beccc823c1f3cf39
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Merge pull request #1369 from smita786/master

fix mousemove conflict:bug#4549


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3eda46b33e0c...127a476be263