From: Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Date: Wed, 25 Jun 2014 15:57:08 +0000 (+0200)
Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_860_probleme_gestion_alternats_et_re... 
X-Git-Tag: debian_7.5_20141208~60^2~4
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=c007c5026da9988ff724cb444818601ef7e15615;hp=-c;p=debian6500.git

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
---

c007c5026da9988ff724cb444818601ef7e15615