Soft'N'Design Software / projects / debian6500.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94e1e9c cd8225a)
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Thu, 3 Jul 2014 14:39:14 +0000 (16:39 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Thu, 3 Jul 2014 14:39:14 +0000 (16:39 +0200)
commit81cd0fafdf1de0b34ad9c1149db052222fca8fa8
tree45058ef4bd535073cd67e22adc999a33720a0620tree | snapshot (tar.gz zip)
parent94e1e9cb5c1e83840f4e2d38e6f2d25115fb1998commit | diff
parentcd8225a9e0a574f347a476e57151c2c689a66887commit | diff
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres

Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_sup/SupBlade/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_sup/SupProdData/CHANGELOG.txt
.gitignore diff1 | diff2 | blob | history
Debian distribution for TRC6500