Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Mon, 23 Jun 2014 09:52:23 +0000 (11:52 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Mon, 23 Jun 2014 13:51:02 +0000 (15:51 +0200)
commit647c157c8e7994bf31d7ca34aff60cc4d206d9fb
tree20f625b32d24bf03759300f2e09c39e6d0531e73
parentccc83a140df840c2004ae8b5305a809a49a1f10d
parent06f63bbcb341bf596157c432fcab180f7ffe0a19
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx

Conflicts:
dev/modele/debian/SConscript
dev/modele/debian/script/start_trc6500.sh
dev/modele/debian_mhf/script/start_trc6500.sh