Adapts merge to properly take into account M/D.
authorStéphane Jacob <sj@m4x.org>
Mon, 25 Apr 2011 11:22:33 +0000 (13:22 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 25 Apr 2011 11:22:33 +0000 (13:22 +0200)
commitad1c9939b07b0ac6da47559421b576074c70c5e1
treed43b6a599c4bd9f3218bd04a80da13efde2b9a2d
parent1ab38437bea57e697716638c939f39f454f4cedd
Adapts merge to properly take into account M/D.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php
modules/fusionax/Anciens.sql
upgrade/1.1.1/08_md_ax_id.sql [new file with mode: 0644]