From: Thomas Pérennou (Viveris Technologie) Date: Tue, 24 Jun 2014 15:08:20 +0000 (+0200) Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5 X-Git-Tag: debian_7.5_20141208~71^2~2 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=b125069fda01d43e1be59d7d45f626d33edb9cd4;p=debian6500.git Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5 FT863 + minor generation script corrections Conflicts: .gitignore --- b125069fda01d43e1be59d7d45f626d33edb9cd4