Soft'N'Design Software / projects / debian6500.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81cd0fa 50ea04f)
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva... int_tr65_nra_2.3.1
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 12:17:33 +0000 (14:17 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 14:01:35 +0000 (16:01 +0200)
commitc7ea02e87f4588aa470a5e78815619f05009803b
tree99601d235b154175c509e2857216c921bbb3acb6tree | snapshot (tar.gz zip)
parent81cd0fafdf1de0b34ad9c1149db052222fca8fa8commit | diff
parent50ea04f8401b9774d9ba728b9dc60d182bb358b3commit | diff
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres with PLOT_T messages size increasing
impacts dependances on libmiso/libgonext/Xgon/Gonext/Monitoring
Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/src/Version.cpp
dev/modele/implementation/trc6500_chaine_sup/SupCapteur/CHANGELOG.txt
.gitignore diff1 | diff2 | blob | history
Debian distribution for TRC6500