Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 051b553ddede2b60f473995d3c89fdf55a043d78
      
https://github.com/phpmyadmin/phpmyadmin/commit/051b553ddede2b60f473995d3c89fdf55a043d78
  Author: Marc Delisle <[email protected]>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ChangeLog
    M libraries/common.lib.php

  Log Message:
  -----------
  Bug #3828 MariaDB reported as MySQL


  Commit: d26b112f40c50c858c27098825e72af449489f5a
      
https://github.com/phpmyadmin/phpmyadmin/commit/d26b112f40c50c858c27098825e72af449489f5a
  Author: Marc Delisle <[email protected]>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Fix merge conflict


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/2246fe70ef7f...d26b112f40c5
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to