Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5
authorThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:08:20 +0000 (17:08 +0200)
committerThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:08:20 +0000 (17:08 +0200)
commitb125069fda01d43e1be59d7d45f626d33edb9cd4
treec127d17fe92319869798a72beb670405d540bc6f
parentd1ee12eaabe23328cbb845f2c74e4e5e90b4f6b6
parent06f63bbcb341bf596157c432fcab180f7ffe0a19
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5

FT863 + minor generation script corrections

Conflicts:
.gitignore