Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_860_probleme_gestion_alternats_et_re...
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 25 Jun 2014 15:57:08 +0000 (17:57 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Wed, 25 Jun 2014 15:57:08 +0000 (17:57 +0200)
commitc007c5026da9988ff724cb444818601ef7e15615
tree20f625b32d24bf03759300f2e09c39e6d0531e73
parentccc83a140df840c2004ae8b5305a809a49a1f10d
parent06f63bbcb341bf596157c432fcab180f7ffe0a19
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite

FT863 + minor generation script corrections

Conflicts:
dev/common/libhrgonio/src/svi/alternat.c