Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: f3c28953d136a5ca76eeef85f638dee77c27341f
https://github.com/phpmyadmin/phpmyadmin/commit/f3c28953d136a5ca76eeef85f638dee77c27341f
Author: Marc Delisle <m...@infomarc.info>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M scripts/create-release.sh
Log Message:
-----------
Fix merge conflict
------------------------------------------------------------------------------
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
