On Tue, Jul 3, 2012 at 6:42 AM, Thilina Buddika Abeyrathna < thilinaabeyrathna@gmail.com> wrote:

On Mon, Jul 2, 2012 at 5:58 PM, Marc Delisle marc@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.

Ok Marc, while merging, I'll ensure PMA_CommonFunctions is used and my

local changes are also there.

...

[0]

https://github.com/phpmyadmin/phpmyadmin/commit/2d055c8190117cf962f6c43d4010...

Thanks Marc.

-- Regards.

Thilina Abeyrathna Gtalk : thilinaabeyrathna skype: thilinabuddika88 thilinaa.wordpress.com

---

Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel