Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux
authorThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:03:03 +0000 (17:03 +0200)
committerThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:03:03 +0000 (17:03 +0200)
commit1d7cb2317290d8af3c4238a1a1e4a5c4b5702b8c
tree9f978f16c33015b13ab0841dd270edbd879d32bd
parent406ead3776221cf4584f109b9e277fb029e6786c
parent06f63bbcb341bf596157c432fcab180f7ffe0a19
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux

FT863 + minor generation script corrections

Conflicts:
.gitignore
.gitignore