From: Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Date: Wed, 25 Jun 2014 09:35:16 +0000 (+0200)
Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_198_parametres_init_statique_donnees... 
X-Git-Tag: debian_7.5_20141208~69^2~1^2~1
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=4836e1d30df670d58ce649fac0036602e9cdb2c0;p=debian6500.git

Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_198_parametres_init_statique_donnees_loc_gps

FT863 + minor generation script corrections

Conflicts:
	dev/modele/debian/script/start_trc6500.sh
---

4836e1d30df670d58ce649fac0036602e9cdb2c0