Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_198_parametres_init_statique_donnees...
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 25 Jun 2014 09:35:16 +0000 (11:35 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 25 Jun 2014 09:35:16 +0000 (11:35 +0200)
commit4836e1d30df670d58ce649fac0036602e9cdb2c0
tree20f625b32d24bf03759300f2e09c39e6d0531e73
parent224108e40f3dfc9b670ccce3bd43cead699ff7e5
parent06f63bbcb341bf596157c432fcab180f7ffe0a19
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