[Phpmyadmin-devel] Changes in upstream master for common functions

Thilina Buddika Abeyrathna thilinaabeyrathna at gmail.com
Tue Jul 3 03:12:41 CEST 2012

On Mon, Jul 2, 2012 at 5:58 PM, Marc Delisle <marc at infomarc.info> wrote:

> Hi Atul and Thilina,
> please watch for the recent changes that were merged to upstream master
> regarding the new PMA_CommonFunctions class.
> You'll have to be extra careful with the code that exists only in your
> repo, when merging upstream master into your repo. Have a look at [0] to
> see what needs to be done to solve the conflicts.
> [0]
> https://github.com/phpmyadmin/phpmyadmin/commit/2d055c8190117cf962f6c43d401003227a3d1758
Thanks Marc.


Thilina Abeyrathna
Gtalk : thilinaabeyrathna
skype: thilinabuddika88
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120703/4426a35d/attachment.html>

More information about the Developers mailing list