rMalie 45645f1f50 // Merge -> revision 9352 ...

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd

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

..

classes

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

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

img

// Merge -> revision 8014

2011-08-11 12:00:05 +00:00

langs

// Merge -> revision 9352

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

php

[*] BO : Carriers are now sortable by position or price

2011-10-12 14:31:36 +00:00

sql

// Merge -> revision 9352

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

xml

[*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders

2011-10-13 08:14:03 +00:00

controller.js

// Merge -> revision 9352

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

index.php

// Merge -> revision 9352

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

model.php

// Merge -> revision 9288

2011-10-12 16:04:28 +00:00

module_tools.php

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

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

preactivation.php

// Merge -> revision 8720

2011-09-22 15:45:10 +00:00

view.css

// Merge -> revision 9352

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