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

Marc Delisle marc at infomarc.info
Mon Jul 2 14:28:04 CEST 2012


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

-- 
Marc Delisle
http://infomarc.info





More information about the Developers mailing list