[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a55595: Bug #3939 PHP NavigationTree error when paging thr...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a555959ed5a0b932521c1e3ea5e5b3c991225427
      https://github.com/phpmyadmin/phpmyadmin/commit/a555959ed5a0b932521c1e3ea5e5b3c991225427
  Author: Serge Barth <sbarth at users.sourceforge.net>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php

  Log Message:
  -----------
  Bug #3939 PHP NavigationTree error when paging through list


  Commit: a8b064c36035a7a09026fea8f6940a6f8371d125
      https://github.com/phpmyadmin/phpmyadmin/commit/a8b064c36035a7a09026fea8f6940a6f8371d125
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #3939


  Commit: 7cca0800e483450653c40485111447e4a35db698
      https://github.com/phpmyadmin/phpmyadmin/commit/7cca0800e483450653c40485111447e4a35db698
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M ChangeLog
    M libraries/navigation/NavigationTree.class.php

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1e64844537e7...7cca0800e483