[Phpmyadmin-devel] Merging grid editing

[Michal Čihař]

Hi

Dne Wed, 10 Aug 2011 06:35:29 -0700 (PDT)
Aris Feryanto <aris_feryanto at yahoo.com> napsal(a):

> Hi Marc,
> 
> > From: Marc Delisle <marc at infomarc.info>
> 
> > 
> > Aris,
> > I would like to merge this feature but I get merge conflicts, can you
> > have a look at this?
> >
> 
> I just fixed the merge conflict in my master branch. Kindly merge the grid editing from there. The master branch also contain some fix for recent tables and configuration for qTip hint. Thanks.

Aris, what is reason for having nearly identical code for grid editing
in both sql.php and tbl_replace.php?

-- 
	Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20110810/2651ce1c/attachment.sig>