Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 12:17:33 +0000 (14:17 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Tue, 8 Jul 2014 17:44:27 +0000 (19:44 +0200)
commit18348f084bcb9464cd33c0bb2a5df69215fd0e51
tree99601d235b154175c509e2857216c921bbb3acb6
parent81cd0fafdf1de0b34ad9c1149db052222fca8fa8
parent50ea04f8401b9774d9ba728b9dc60d182bb358b3
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
Correcs ITRSOI dependances
.gitignore