Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a498a6c8cb73ca5aaec14f4857618c47081febe6
      
https://github.com/phpmyadmin/phpmyadmin/commit/a498a6c8cb73ca5aaec14f4857618c47081febe6
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  bug #3995 Drizzle server charset notice


  Commit: 99b477ffd4c46f9ce5cb58cca7fd27dd3c68af74
      
https://github.com/phpmyadmin/phpmyadmin/commit/99b477ffd4c46f9ce5cb58cca7fd27dd3c68af74
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2013-10-06 (Sun, 06 Oct 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/sqlparser.lib.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/a95a3f4cdb89...99b477ffd4c4
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to