rMalie
|
2180359342
|
// Merge -> revision 8720
|
2011-09-22 15:45:10 +00:00 |
|
aFolletete
|
48f666d29d
|
[*] Project : Version 2 of Smarty has been removed for using only version 3
|
2011-09-14 13:27:32 +00:00 |
|
rMalie
|
a1bdb7b35e
|
// Merge -> revision 8507
|
2011-09-12 16:17:37 +00:00 |
|
rMalie
|
3d89058084
|
// Merge -> revision 8342
|
2011-09-05 14:56:02 +00:00 |
|
tDidierjean
|
a7ad178f28
|
//// Merge -> revision 8290
|
2011-09-01 09:53:43 +00:00 |
|
rMalie
|
35055a3a70
|
// Merge -> revision 8199
|
2011-08-26 07:59:29 +00:00 |
|
rMalie
|
d0dbb5c185
|
// Merge -> revision 8014
|
2011-08-11 12:00:05 +00:00 |
|
rMalie
|
792ce71cd4
|
// Merge -> revision 7979
|
2011-08-10 08:36:17 +00:00 |
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
3c8c85b1cd
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
|
2011-08-02 09:54:23 +00:00 |
|
rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
rMalie
|
5f6f018885
|
// REVERT MERGE
|
2011-07-27 13:35:06 +00:00 |
|
rMalie
|
233c0076b7
|
// MERGE with trunk revision 7754
|
2011-07-27 12:48:42 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|
aFolletete
|
7520512855
|
// merge form 1.4 version (rev. 5937)
|
2011-04-15 16:46:20 +00:00 |
|
mMarinetti
|
b9efdffa17
|
// merge, fix from 1.4 PSCFI-1466
|
2011-04-15 14:39:53 +00:00 |
|
fBrignoli
|
5e2884a8fa
|
// merge 1.4 (5916) => 1.5.x
|
2011-04-15 10:30:56 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|