vSchoener 6b05bbab93 // Fix merging issue

2011-12-05 18:11:57 +00:00

..

classes

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:46:33 +00:00

docs

// Merge -> 10309

2011-11-21 11:05:10 +00:00

images

// Merge -> 10309

2011-11-21 11:05:10 +00:00

js

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:46:33 +00:00

lib

// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00

AdminMondialRelay.gif

2011-07-06 10:54:11 +00:00

AdminMondialRelay.php

// Merge -> 10309

2011-11-21 11:05:10 +00:00

ajax.php

// Merge -> revision 9221

2011-10-11 12:45:12 +00:00

config.xml

// Merge -> 10309

2011-11-21 11:05:10 +00:00

cron.php

// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names

2011-10-10 12:18:56 +00:00

de.php

// Translation files

2011-11-28 10:51:48 +00:00

en.php

2011-07-06 10:54:11 +00:00

errorCode.php

2011-07-06 10:54:11 +00:00

es.php

// Merge -> revision 9352

2011-10-14 08:20:54 +00:00

fr.php

// Merge -> 10309

2011-11-21 11:05:10 +00:00

header.tpl

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:54:40 +00:00

index.php

// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00

it.php

// Translation files

2011-11-28 10:51:48 +00:00

logo_hd.png

// Merge with revision 7841

2011-08-02 11:43:58 +00:00

logo.gif

2011-07-06 10:54:11 +00:00

logo.png

// new icon for adminhome, adminmodules and header

2011-11-21 09:21:26 +00:00

mondialrelay.js

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:46:33 +00:00

mondialrelay.php

// Fix merging issue

2011-12-05 18:11:57 +00:00

mondialrelay.tpl

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:46:33 +00:00

mrInstall.sql

2011-07-06 10:54:11 +00:00

orderDetail.tpl

// Merge -> 10309

2011-11-21 11:05:10 +00:00

page_iso.php

2011-07-06 10:54:11 +00:00

sitemap.xml

2011-07-06 10:54:11 +00:00

style.css

[-] MO : Mondialrelay, merge 1.4 => 1.5

2011-12-05 10:46:33 +00:00