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)
FT863 + minor generation script corrections

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


Trivial merge