Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccc83a1 06f63bb)
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)
Conflicts:
dev/modele/debian/SConscript
dev/modele/debian/script/start_trc6500.sh
dev/modele/debian_mhf/script/start_trc6500.sh


Trivial merge
Debian distribution for TRC6500